am cd3028dc: am 84a9a3c0: Merge "CpuConsumer: inherit from ConsumerBase" into jb-mr1-dev

* commit 'cd3028dc0b943584ae16b624e79551c60cf27dd7':
  CpuConsumer: inherit from ConsumerBase
am 317357fd: Merge "get rid of mirrorItemAt() which isn\'t used anywhere" into jb-mr1-dev

* commit '317357fdf7a2b542dfdaa06f42ff7f5f0153f9a3':
  get rid of mirrorItemAt() which isn't used anywhere
am 186e2bd0: am 317357fd: Merge "get rid of mirrorItemAt() which isn\'t used anywhere" into jb-mr1-dev

* commit '186e2bd064336c75bf2fc6681ec294a85113fd38':
  get rid of mirrorItemAt() which isn't used anywhere
am 1648d4c1: put back the unused virtuals in Vector<>

* commit '1648d4c13ba2eff3ea14cd87ee94028458a39f97':
  put back the unused virtuals in Vector<>
am 9cf3b93b: am 1648d4c1: put back the unused virtuals in Vector<>

* commit '9cf3b93bc73d787d21d88b4295fd902dcc7cae23':
  put back the unused virtuals in Vector<>
am a4cb35a2: fix various issues in SF\'s EventThread

* commit 'a4cb35a2864d58e9a764a17623e15ab25a9964a0':
  fix various issues in SF's EventThread
am a2f58b17: am a4cb35a2: fix various issues in SF\'s EventThread

* commit 'a2f58b17057b25eb3564505509a62a1d687c4306':
  fix various issues in SF's EventThread
am 3f395623: Added display initialization method

* commit '3f3956236aac97b6aa25fa89f0983d5e9d065fdb':
  Added display initialization method
am 30b84c7d: am 3f395623: Added display initialization method

* commit '30b84c7d035c51a02238fd6163679876552863e6':
  Added display initialization method
Reconcile with jb-mr1-release - do not merge

Change-Id: Idb96902f4272f83b3ebc1081ace5d2511d4281b7
am ee8445a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'ee8445a4de6a3a1d8eb3e4e9b0aadc582e121a9a':
  fix various issues in SF's EventThread
  Revert "SurfaceTexture: inherit from ConsumerBase"
am 04930445: Merge "Add BufferItemConsumer, a simple BufferQueue consumer." into jb-mr1-dev

* commit '04930445031c5f41707806182bb7a152e64ddede':
  Add BufferItemConsumer, a simple BufferQueue consumer.
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