am 898b4f88: am 04930445: Merge "Add BufferItemConsumer, a simple BufferQueue consumer." into jb-mr1-dev

* commit '898b4f88a18e9bcc41ce08c011f1b7dc1e57a3c1':
  Add BufferItemConsumer, a simple BufferQueue consumer.
am 9f54ac38: ui/Fence: change the TIMEOUT_NEVER value to -1

* commit '9f54ac38860761ef62d9bb8282d54ff51a1a68a3':
  ui/Fence: change the TIMEOUT_NEVER value to -1
am 97799fbb: am 9f54ac38: ui/Fence: change the TIMEOUT_NEVER value to -1

* commit '97799fbb2d1ac18566d7b25239165ed14de55d98':
  ui/Fence: change the TIMEOUT_NEVER value to -1
am 8f971ff6: Pass the correct number of displays based on HWC version

* commit '8f971ff6661c875e7adb3f14731e1579c3c80c62':
  Pass the correct number of displays based on HWC version
am c4f4e7f9: am 8f971ff6: Pass the correct number of displays based on HWC version

* commit 'c4f4e7f968c15bae04364e052d649305c1f9941c':
  Pass the correct number of displays based on HWC version
am bc46e0ad: Merge "Revert "Added display initialization method"" into jb-mr1-dev

* commit 'bc46e0ad869befcfa97f6272615cdeae2135008f':
  Revert "Added display initialization method"
am 519b3e4a: am bc46e0ad: Merge "Revert "Added display initialization method"" into jb-mr1-dev

* commit '519b3e4a3b78f63597ab4de4d92d1780fdcad9bd':
  Revert "Added display initialization method"
Reconcile with jb-mr1-release - do not merge

Change-Id: Ida7b9f23f8deb451a9e6e9f2714d7a677fb6ca1c
am 0ff05c75: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0ff05c75d786ec8d45e4c10888345f24db49fab3':
  Revert "Added display initialization method"
am d12780ed: Merge "Update for cleanups in hwc interface" into jb-mr1-dev

* commit 'd12780ed123b54687fea534b34f54ef9c678cdcd':
  Update for cleanups in hwc interface
am a6506488: am d12780ed: Merge "Update for cleanups in hwc interface" into jb-mr1-dev

* commit 'a6506488dab8edd46324319a6fa29e9ab24176cd':
  Update for cleanups in hwc interface
am 7c9e8263: Merge "simplify further vsync handling" into jb-mr1-dev

* commit '7c9e82633c5c4f85b896a5879bdb25cdf659646e':
  simplify further vsync handling
am 0336f30c: am 7c9e8263: Merge "simplify further vsync handling" into jb-mr1-dev

* commit '0336f30c575008db2afc821d8807231797102f77':
  simplify further vsync handling
am e60b0687: HWComposer now has its own concept of display IDs

* commit 'e60b0687c8d49871d0c8786cabe6851f7a7783b5':
  HWComposer now has its own concept of display IDs
am 30bcc614: remove support for HWC < 1.0

* commit '30bcc61431d8e3bef779472dd52a7b156dcaba09':
  remove support for HWC < 1.0
am f4358634: teach HWC about multiple displays

* commit 'f435863467ab407f2a482604beed5fa6f0144c62':
  teach HWC about multiple displays
am 4f2f0997: am e60b0687: HWComposer now has its own concept of display IDs

* commit '4f2f099720ceb9ab19a88babfbbc1abb6e64538b':
  HWComposer now has its own concept of display IDs
am df5fbf36: am 30bcc614: remove support for HWC < 1.0

* commit 'df5fbf367595c8cca9a7986167dc51c9636461e9':
  remove support for HWC < 1.0
am a301dab9: am f4358634: teach HWC about multiple displays

* commit 'a301dab968d27f3c4ca2b247d0e05ac58de248ee':
  teach HWC about multiple displays
am 53ade085: Added display initialization method

* commit '53ade0853ca003c9e917b5e7d34e1b1338d7b87d':
  Added display initialization method