Merge commit '30dc8d1eeb318ea374a5f03fa91ea5089c3dc8ea' into eclair-mr2-plus-aosp
* commit '30dc8d1eeb318ea374a5f03fa91ea5089c3dc8ea':
Remove external/protobuf from the build, now that it's
Merge commit 'd1841144e4d592724001018f427806edb9c72ae0' into eclair-mr2-plus-aosp
* commit 'd1841144e4d592724001018f427806edb9c72ae0':
Fix 2261626: Don't show text on button if orientation is vertical.
Merge commit '7c1c46000be136ffda36283fdc93bfe3cba72601' into eclair-mr2
* commit '7c1c46000be136ffda36283fdc93bfe3cba72601':
Fix 2261626: Don't show text on button if orientation is vertical.
Merge commit '7c1c46000be136ffda36283fdc93bfe3cba72601' into eclair-plus-aosp
* commit '7c1c46000be136ffda36283fdc93bfe3cba72601':
Fix 2261626: Don't show text on button if orientation is vertical.
2206097: Broken suggestions while composing message
2166583: Color artifacts with MDP dithering
2261119: Passion transition animations are rough
2216759: Screen flicker when dropdown list in background window shows or hides
This is part of enabling GPU composition instead of using the MDP. This change
is dependent on another change in the vendor project.
Specifically this change disables the use of EGLImageKHR for s/w buffers
for cache coherency reasons. memcpy is used instead.
Merge commit 'aca29235a75bde8baf121b7e54b058d29f286003' into eclair-mr2-plus-aosp
* commit 'aca29235a75bde8baf121b7e54b058d29f286003':
Import revised translations. DO NOT MERGE
Merge commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9' into eclair-mr2
* commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9':
Import revised translations. DO NOT MERGE
Merge commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9' into eclair-plus-aosp
* commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9':
Import revised translations. DO NOT MERGE
Merge commit '35ede78ede13fc2c4e7d343f50ca20372a404e06' into eclair-mr2-plus-aosp
* commit '35ede78ede13fc2c4e7d343f50ca20372a404e06':
fix some aspects of [2258746] native crash in launcher2
Merge commit '91e40e7838d183cb2a9e750edf0a6572f21da21d' into eclair-mr2
* commit '91e40e7838d183cb2a9e750edf0a6572f21da21d':
fix some aspects of [2258746] native crash in launcher2
Merge commit '91e40e7838d183cb2a9e750edf0a6572f21da21d' into eclair-plus-aosp
* commit '91e40e7838d183cb2a9e750edf0a6572f21da21d':
fix some aspects of [2258746] native crash in launcher2
Surface::validate() could sometimes dereference a null pointer before checking it wasn't null.
This will prevent the application to crash when given bad parameters or used incorrectly.
However, the bug above probably has another cause.
Merge commit 'dc6563393789e90d75b44b9ce97c167863bf0771' into eclair-mr2-plus-aosp
* commit 'dc6563393789e90d75b44b9ce97c167863bf0771':
Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-mr2
* commit '991475a2e5dcb344299387521b52fb637d6b1e4d':
Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-plus-aosp
* commit '991475a2e5dcb344299387521b52fb637d6b1e4d':
Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
Merge commit '7d7257dd9cbe38453678f2803032e283a0344424' into eclair-mr2-plus-aosp
* commit '7d7257dd9cbe38453678f2803032e283a0344424':
Fix the full-weekday date format strings to actually use the full weekday.
Merge commit '373329d477d2db20c66a85aa3e23a696d76a9954' into eclair-mr2-plus-aosp
* commit '373329d477d2db20c66a85aa3e23a696d76a9954':
update dox to account for different behavior between AVOID and TARGET modes
Merge commit '65f27f8721ae648ceffffb59a83e2af0d4641920' into eclair-plus-aosp
* commit '65f27f8721ae648ceffffb59a83e2af0d4641920':
Fix the full-weekday date format strings to actually use the full weekday.
Merge commit '65f27f8721ae648ceffffb59a83e2af0d4641920' into eclair-mr2
* commit '65f27f8721ae648ceffffb59a83e2af0d4641920':
Fix the full-weekday date format strings to actually use the full weekday.
Needed for the fix for b/2260437 (device wakes itself back up when camera is last application running)
Change-Id: I0e419fcf05542df203eb3f127dde7a888416e86d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '235657dbe06c4fea8860ec9fef834a6b36da9700' into eclair-mr2-plus-aosp
* commit '235657dbe06c4fea8860ec9fef834a6b36da9700':
Removed the fixed height in the sim unlock screen's header.
Merge commit '73f8aa678055598738dfba54c60a1674bcbf02b1' into eclair-mr2
* commit '73f8aa678055598738dfba54c60a1674bcbf02b1':
Removed the fixed height in the sim unlock screen's header.
