Adds a "junk path" option to aapt so that you can do:
aapt add -k archive.zip path/to/some.file
and have the file stored in the zip under the name "some.file"
(without the path). Needed so that we can use 'aapt add' in place of
'zip -j' when building jar files, which will lead to smaller
incremental OTAs.
(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
Merge commit '18dc8826a2c7244a7a61c9c53113516416db4714'
* commit '18dc8826a2c7244a7a61c9c53113516416db4714':
Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit '992f4802aefba9f4a8122cc5332f2bc726a3f3f6' into eclair-mr2-plus-aosp
* commit '992f4802aefba9f4a8122cc5332f2bc726a3f3f6':
Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit 'b34d5d527596102ae7a040d787e4d8c336bf192b' into eclair-mr2
* commit 'b34d5d527596102ae7a040d787e4d8c336bf192b':
Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit 'c0df229d203aa8d4f06c7847c0d53d8ad9026b74'
* commit 'c0df229d203aa8d4f06c7847c0d53d8ad9026b74':
Proper fix for zero signal strength and no_service. Fixes#2176141
Fiddle around with the offsets of wallpapers to have better defaults, and
update the offset when the currently wallpaper target is not setting an
offset itself.
Change-Id: I1864d098fb4813fb0c67857af8ebf398b35e6876
Merge commit 'b0f4d0cd249773927c891ab52505505b6b19347b' into eclair-mr2-plus-aosp
* commit 'b0f4d0cd249773927c891ab52505505b6b19347b':
Proper fix for zero signal strength and no_service. Fixes#2176141
Merge commit 'f37447bad3773b62176baa837908daf6edb44273' into eclair-mr2
* commit 'f37447bad3773b62176baa837908daf6edb44273':
Proper fix for zero signal strength and no_service. Fixes#2176141
Merge commit '39f4408f994a37fd805c964c673ec7ad1702a817' into eclair-mr2-plus-aosp
* commit '39f4408f994a37fd805c964c673ec7ad1702a817':
Update 5.xml with last minute changes.
Track phone service state changes and use a separate timer for out-of-service
since the hunting can timeout on some devices.
Store the timeout value in the config.xml, as it is device/network specific.
Settings App will also change to use the hunting duration to compute the cost
of zero signal.
Merge commit 'b5d69242d10021f82632d62c30b1ce63785c9386' into eclair-mr2
* commit 'b5d69242d10021f82632d62c30b1ce63785c9386':
Update 5.xml with last minute changes.
Merge commit '220f052f6103655e08cba6cfb1dc542b81ffab11'
* commit '220f052f6103655e08cba6cfb1dc542b81ffab11':
one step towards fixing [2071412] work around mdp 32-bits fade limitation
Merge commit 'ae26b8b6f40ad037927bf02ffd47953001c2cb3b' into eclair
* commit 'ae26b8b6f40ad037927bf02ffd47953001c2cb3b':
Update 5.xml with last minute changes.
Merge commit 'cf4ff74017ec6b29646022ae5cbf667483b6137b' into eclair-mr2-plus-aosp
* commit 'cf4ff74017ec6b29646022ae5cbf667483b6137b':
one step towards fixing [2071412] work around mdp 32-bits fade limitation
Merge commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4' into eclair-mr2
* commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4':
one step towards fixing [2071412] work around mdp 32-bits fade limitation
Merge commit 'dad4780bbd6be0891ea8745bd274fc8d6882f071' into eclair-mr2-plus-aosp
* commit 'dad4780bbd6be0891ea8745bd274fc8d6882f071':
support for multiline paragraph style indentation
Merge commit 'f9feb96e4ff4e390112410f0b4a514a0fca951d8' into eclair-mr2-plus-aosp
* commit 'f9feb96e4ff4e390112410f0b4a514a0fca951d8':
Add access to ContentProvider for SyncState.
Merge commit '788a7ee1e9277dcce016fd084c81614222f7374a' into eclair-mr2-plus-aosp
* commit '788a7ee1e9277dcce016fd084c81614222f7374a':
Add a string for upload file button.
Merge commit 'ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd'
* commit 'ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd':
Avoid signaling a format change to the client if its insubstantial.
Merge commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba' into eclair-mr2-plus-aosp
* commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba':
Avoid signaling a format change to the client if its insubstantial.
Merge commit 'bf10842617ec2893d8b1ac6070164f4ad2c6d4bf' into eclair-mr2-plus-aosp
* commit 'bf10842617ec2893d8b1ac6070164f4ad2c6d4bf':
Update 5.xml with last minute changes.
