Merge commit 'c104e1b3912f1389848b0cc841866564d9314287'
* commit 'c104e1b3912f1389848b0cc841866564d9314287':
Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
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 '7d7257dd9cbe38453678f2803032e283a0344424' into eclair-mr2-plus-aosp
* commit '7d7257dd9cbe38453678f2803032e283a0344424':
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 '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 '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 '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
Merge commit 'b0d2313ea49194b8ab6caa987aaa680a45dd38b2' into eclair-mr2-plus-aosp
* commit 'b0d2313ea49194b8ab6caa987aaa680a45dd38b2':
docs: document the 'showSearchIconAsBadge" flag and
* changes:
Make WRITE_GSERVICES into system-or-signature (instead of just signature), as a temporary measure so unbundled Google components (GSF, etc.) can hold it. (In the longer term, WRITE_GSERVICES won't be a system permission at all, but it or something like it will be defined directly by GSF.)
Merge commit '27d6e65b71f515deafbd93d5aa98732898c34ddf' into eclair-mr2
* commit '27d6e65b71f515deafbd93d5aa98732898c34ddf':
Add support for making a LiveWallpaper the default
Merge commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f' into eclair-mr2
* commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f':
docs: document the 'showSearchIconAsBadge" flag and
Add check in getOwnerPhoneNumberVcard(). If the incoming phonenumber is empty,
do not add "TEL" to vcard data.
Original Change by: Yue Lixin
DrNo: Eastham
Bug: 2247067
Merge commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51' into eclair
* commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51':
docs: document the 'showSearchIconAsBadge" flag and
Merge commit '2a77d4633aae1d04054fb09850d7939aa386b0a0'
* commit '2a77d4633aae1d04054fb09850d7939aa386b0a0':
Add unit tests for Japanization and fix several bugs.
Merge commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef' into eclair-mr2-plus-aosp
* commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef':
Add code to use Gservices provided values for throtting NITZ updates.
as a temporary measure so unbundled Google components (GSF, etc.) can hold
it. (In the longer term, WRITE_GSERVICES won't be a system permission at
all, but it or something like it will be defined directly by GSF.)
