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 '70a37eac62e887d16c4964b805a612d41254ca7f'
* commit '70a37eac62e887d16c4964b805a612d41254ca7f':
fix some aspects of [2258746] native crash in launcher2
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 'c104e1b3912f1389848b0cc841866564d9314287'
* commit 'c104e1b3912f1389848b0cc841866564d9314287':
Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
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 '3eb76e1669807c737e883c5a5f094a170f55a3b9'
* commit '3eb76e1669807c737e883c5a5f094a170f55a3b9':
Fix the full-weekday date format strings to actually use the full weekday.
Merge commit '0d973ad63401af0a5f5b5bcdbac4acddccfbcec0'
* commit '0d973ad63401af0a5f5b5bcdbac4acddccfbcec0':
update dox to account for different behavior between AVOID and TARGET modes
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-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 '66b6b90bbf2d3f71574472bdabe87f2b4b4d10d0'
* commit '66b6b90bbf2d3f71574472bdabe87f2b4b4d10d0':
Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit '73f8aa678055598738dfba54c60a1674bcbf02b1' into eclair-mr2
* commit '73f8aa678055598738dfba54c60a1674bcbf02b1':
Removed the fixed height in the sim unlock screen's header.
Merge commit 'f05ec9237ec907be3f2c581a950149435bd585fb' into eclair-mr2-plus-aosp
* commit 'f05ec9237ec907be3f2c581a950149435bd585fb':
Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit '998531f5ea523faf11cb1a2a325995ea661c909f'
* commit '998531f5ea523faf11cb1a2a325995ea661c909f':
Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit '94140b35541b955589f878ce6b26b65c3b3e18ac' into eclair-mr2-plus-aosp
* commit '94140b35541b955589f878ce6b26b65c3b3e18ac':
Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit '0b81ce217ea56290f10a301cfca1c9fdce876d43'
* commit '0b81ce217ea56290f10a301cfca1c9fdce876d43':
Make WRITE_GSERVICES into system-or-signature (instead of just signature),
Merge commit 'fcd2917a3550e2b4f5c6ff2038ae5de91c81d28c'
* commit 'fcd2917a3550e2b4f5c6ff2038ae5de91c81d28c':
Add support for making a LiveWallpaper the default
Merge commit 'b9456ac7263393bca14697ad0b28f51b28a16d38'
* commit 'b9456ac7263393bca14697ad0b28f51b28a16d38':
A little more on #2256270: Package manager sends bad broadcasts when components change
Merge commit 'fd13fb7a9cbda152c25f28989cb3ce2e316406d3'
* commit 'fd13fb7a9cbda152c25f28989cb3ce2e316406d3':
docs: document the 'showSearchIconAsBadge" flag and
Merge commit '5da824210ee34f051c295c12f6bcc4b617da4a1a' into eclair-mr2-plus-aosp
* commit '5da824210ee34f051c295c12f6bcc4b617da4a1a':
Make WRITE_GSERVICES into system-or-signature (instead of just signature),
Merge commit 'aaa8e7e633b61b221d10f21006bf2cd197004093' into eclair-mr2-plus-aosp
* commit 'aaa8e7e633b61b221d10f21006bf2cd197004093':
Add support for making a LiveWallpaper the default
