Merge commit '0d973ad63401af0a5f5b5bcdbac4acddccfbcec0'
* commit '0d973ad63401af0a5f5b5bcdbac4acddccfbcec0':
update dox to account for different behavior between AVOID and TARGET modes
Merge commit '373329d477d2db20c66a85aa3e23a696d76a9954' into eclair-mr2-plus-aosp
* commit '373329d477d2db20c66a85aa3e23a696d76a9954':
update dox to account for different behavior between AVOID and TARGET modes
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
Merge commit '6e0ff0c37cd293d49c3c874ee30a49b1d5902b5e' into eclair-mr2-plus-aosp
* commit '6e0ff0c37cd293d49c3c874ee30a49b1d5902b5e':
A little more on #2256270: Package manager sends bad broadcasts when components change
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 '826d17c0690e086ed96f43714d731ec6e0ddcf96' into eclair-mr2
* commit '826d17c0690e086ed96f43714d731ec6e0ddcf96':
A little more on #2256270: Package manager sends bad broadcasts when components change
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 '99e03a3f94ff8bbd68599e7f43517dbc25421fe9'
* commit '99e03a3f94ff8bbd68599e7f43517dbc25421fe9':
Improvements for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes
Merge commit 'bd328d0113ae29bd351d39faedc6c4e7957db4ad'
* commit 'bd328d0113ae29bd351d39faedc6c4e7957db4ad':
Modify the binder to request 1M - 2 pages instead of 1M. The backing store
Merge commit '567716acc5761245e7073f258f74cad769d97f34'
* commit '567716acc5761245e7073f258f74cad769d97f34':
PackageManager: Support secondary ABI for native code at installation time.
Merge commit 'da5e90bee443129511e231e9078a134626b87541'
* commit 'da5e90bee443129511e231e9078a134626b87541':
fix [2236865] STOPSHIP: bump soft gl and egl minor version number
Merge commit 'adf38939836ee1d1f5967fc45d02e07117f44009'
* commit 'adf38939836ee1d1f5967fc45d02e07117f44009':
Defer EGL init until the surface changed call comes in. Pass w,h along with surface for verification of driver state.
Merge commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51' into eclair
* commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51':
docs: document the 'showSearchIconAsBadge" flag and
Merge commit '2172084ca7fa2c0df6b28ecedfa689b60e980ccf' into eclair-mr2-plus-aosp
* commit '2172084ca7fa2c0df6b28ecedfa689b60e980ccf':
Import revised translations. DO NOT MERGE
Merge commit 'b4c20fca102a2ec6acf1648f2fd16d54fdc07f56' into eclair-mr2
* commit 'b4c20fca102a2ec6acf1648f2fd16d54fdc07f56':
Import revised translations. DO NOT MERGE
Merge commit '6efdbcc3c1afafe2f9401668ce252167600b498f' into eclair-mr2-plus-aosp
* commit '6efdbcc3c1afafe2f9401668ce252167600b498f':
Improvements for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes
Merge commit '9b94211787b237fd59153f58dd41d738290866c4' into eclair-mr2-plus-aosp
* commit '9b94211787b237fd59153f58dd41d738290866c4':
Modify the binder to request 1M - 2 pages instead of 1M. The backing store
Merge commit '097855eb00971092ff6332aa2bf0fae71f42ab5f' into eclair-mr2-plus-aosp
* commit '097855eb00971092ff6332aa2bf0fae71f42ab5f':
PackageManager: Support secondary ABI for native code at installation time.
