am 525178d5: am e6b5c05a: Add a helper for dumping layers into the log

Merge commit '525178d59af3539a274b721eeeff028bf3f40288'

* commit '525178d59af3539a274b721eeeff028bf3f40288':
  Add a helper for dumping layers into the log
added a new hint to tell SF it should clear the FB for some layers

Change-Id: I784e7c5be2eab84c321773dc53b4cb657ca9a457
am cdd44a0d: added a new hint to tell SF it should clear the FB for some layers

Merge commit 'cdd44a0db36749af5036e903e4867b279ef420df' into gingerbread-plus-aosp

* commit 'cdd44a0db36749af5036e903e4867b279ef420df':
  added a new hint to tell SF it should clear the FB for some layers
am ee1b98f8: am cdd44a0d: added a new hint to tell SF it should clear the FB for some layers

Merge commit 'ee1b98f8b3016173b3aadcb652cc53c5ca09c093'

* commit 'ee1b98f8b3016173b3aadcb652cc53c5ca09c093':
  added a new hint to tell SF it should clear the FB for some layers
Revert hwcomposer HAL. DO NOT MERGE.

This reverts commit cdd44a0db36749af5036e903e4867b279ef420df.
This reverts commit e6b5c05aa0236dc42107d028a366a3fd2678677b.
This reverts commit 5d3de309f44f6a72f2a46db792f3865088897039.
am 2698f0cd: Revert hwcomposer HAL. DO NOT MERGE.

Merge commit '2698f0cd99ee0cb8c88d06ea3555edbf7606c07a' into gingerbread-plus-aosp

* commit '2698f0cd99ee0cb8c88d06ea3555edbf7606c07a':
  Revert hwcomposer HAL. DO NOT MERGE.
Fix build (missing #include).

Change-Id: Icafc2289d1320f2cd41e8756363240268780d8b8
am 5f5c5460: Fix build (missing #include).

Merge commit '5f5c5460d382104a8792952907aa2fa0cae1bca7' into gingerbread-plus-aosp

* commit '5f5c5460d382104a8792952907aa2fa0cae1bca7':
  Fix build (missing #include).
revert pixelformat hack

Change-Id: Ia5e01b2b2f205f48ede1d29275094a64221df2d4
Merge "revert pixelformat hack" into gingerbread
am 76022c6f: Merge "revert pixelformat hack" into gingerbread

Merge commit '76022c6f4417ac91069c010aa15044e07f7b7d2e' into gingerbread-plus-aosp

* commit '76022c6f4417ac91069c010aa15044e07f7b7d2e':
  revert pixelformat hack
am 5032cb8b: (-s ours) am 2698f0cd: Revert hwcomposer HAL. DO NOT MERGE.

Merge commit '5032cb8b03021a0874c296059833982daf0705b3'

* commit '5032cb8b03021a0874c296059833982daf0705b3':
  Revert hwcomposer HAL. DO NOT MERGE.
resolved conflicts for merge of b01a043d to gingerbread-plus-aosp

Change-Id: I60466613c7ea0335a78d553a10876367d65557d9
add new sensor types for handling gyro data and device orientation more efficiently.

Change-Id: I89faf5b3d57a3e726d1c347ce01d931b100188cd
am 0b948165: am 5f5c5460: Fix build (missing #include).

Merge commit '0b9481652bea42330503bf136ef7fac859a1dd18'

* commit '0b9481652bea42330503bf136ef7fac859a1dd18':
  Fix build (missing #include).
am 3691181b: am 76022c6f: Merge "revert pixelformat hack" into gingerbread

Merge commit '3691181b21454bcd56c9521e8b61d96ed6e01f84'

* commit '3691181b21454bcd56c9521e8b61d96ed6e01f84':
  revert pixelformat hack
am 4ec14c1e: add new sensor types for handling gyro data and device orientation more efficiently.

Merge commit '4ec14c1e233bbc0c7c7efe990f2fafe9727179ca' into gingerbread-plus-aosp

* commit '4ec14c1e233bbc0c7c7efe990f2fafe9727179ca':
  add new sensor types for handling gyro data and device orientation more efficiently.
resolved conflicts for merge of 5e610d6a to master

Change-Id: Ibeaa176ff4b25f81559d14dd8c73283ee4f2eacf
am a9c5514e: am 4ec14c1e: add new sensor types for handling gyro data and device orientation more efficiently.

Merge commit 'a9c5514e74a921eec19c912ca93cc666e496dc93'

* commit 'a9c5514e74a921eec19c912ca93cc666e496dc93':
  add new sensor types for handling gyro data and device orientation more efficiently.
Fix sim-eng build.

Missing a <string.h> header.

git cherry-pick -e d0019991

Change-Id: I7a3dc7cb7d2855fde56512b3dcb181a092055497