Merge commit '64d54042ff5c2c736a65f200296dbc3bceaa9029' into eclair-plus-aosp
* commit '64d54042ff5c2c736a65f200296dbc3bceaa9029':
Futher reduce the logging of EriManager.
Merge commit '64d54042ff5c2c736a65f200296dbc3bceaa9029' into eclair-mr2
* commit '64d54042ff5c2c736a65f200296dbc3bceaa9029':
Futher reduce the logging of EriManager.
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.
the old db and re-do it. If it still fails, something
bad happens, like the directory may have the different
permission. Let it throw as WebView needs the db.
Fix http://b/issue?id=2179339
Merge commit '5a4f64fcbf0382f33e9f79e6d0497113b972690e' into eclair-mr2-plus-aosp
* commit '5a4f64fcbf0382f33e9f79e6d0497113b972690e':
Prevent getFile from copying when the file is too large.
Merge commit '6815a67c5322cbde7768330fd12882d955abdd2a'
* commit '6815a67c5322cbde7768330fd12882d955abdd2a':
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
Merge commit '6195432b6fde3cda4bc7e2406c8f2975795933a7'
* commit '6195432b6fde3cda4bc7e2406c8f2975795933a7':
Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
Fix issue #2176944: Need API so browser, others can determine memory size of device
Fix issue #2177262: Improve animations
Fix issue #2174566: HOT STABILITY: NPE in activity manager
Merge commit '94f3a36326ddecaa09787d795451b0a229fe111c'
* commit '94f3a36326ddecaa09787d795451b0a229fe111c':
Remove STOPSHIP BT logging.
BT API security audit: fix a couple of permission mistakes.
Fix issue #2175693: Add vmallocinfo to dumpstate
add a way to easily catch and log GL errors (compile time flag)
GPS: Fix problem with SUPL when SUPL APN is already active.
Import revised translations. DO NOT MERGE
Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Import revised translations. DO NOT MERGE
Merge commit '1c83540e3829dc9664728f1f017686f16f61a4ea'
* commit '1c83540e3829dc9664728f1f017686f16f61a4ea':
Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
Merge commit '6036288ad953e56433a9936fad09213b328cad71'
* commit '6036288ad953e56433a9936fad09213b328cad71':
Make FWK start a wifi scan if supplicant forgets.
Merge commit '39c923a94c377a75e34153f6dddb83fc9883d2a7'
* commit '39c923a94c377a75e34153f6dddb83fc9883d2a7':
Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
Merge commit '0221ec55ac57f32a42fb1e7b66779ca955d58558'
* commit '0221ec55ac57f32a42fb1e7b66779ca955d58558':
Control H icon display in Status bar.
Fixes#2175599. Prevents an NPE when AttachInfo is null.
Set the Bond State to NONE when we receive a Agent Cancel.
Make vCard import Photo from vCard file :(
Merge commit 'd34f3994da32d0fcf5f6d6824d123d51c02c988e' into eclair-mr2-plus-aosp
* commit 'd34f3994da32d0fcf5f6d6824d123d51c02c988e':
Work on issue #2144454: Inconsistent swipes...
Merge commit 'a6b76c35a482bd7f2cbab186aca9ea6e74a375d0'
* commit 'a6b76c35a482bd7f2cbab186aca9ea6e74a375d0':
The vendor is about to check in a fix for this issue, the workaround is no longer needed
Merge commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d' into eclair-plus-aosp
* commit '2a21a77d5cf481b129a7cb4e3e00424e4d300e6d':
Work on issue #2144454: Inconsistent swipes...
Merge commit 'ec61707d39c14950f53795b0610ea1ee00daecdb'
* commit 'ec61707d39c14950f53795b0610ea1ee00daecdb':
fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204
