For testing purposes it is deseriable to allow
vendors to provide an alternate eri file. This
fixes Part A of bug 2108379.
Bug:2108379
Change-Id: I51703c9ac211ced053418e28e277dfab68deea21
Merge commit '635c4b41ca2d8c8b697527e8b4039aef99d6efde'
* commit '635c4b41ca2d8c8b697527e8b4039aef99d6efde':
Fix issue #1943927: need notification in status bar when adb is active
Merge commit 'e1d85dca89d45d2fca7b379827ee33ae656b61fb'
* commit 'e1d85dca89d45d2fca7b379827ee33ae656b61fb':
Dialog titles would sometimes use a font too large.
Merge commit 'e8f0603eb631ecef5f41105711f4afdea8c6d8d8' into eclair-plus-aosp
* commit 'e8f0603eb631ecef5f41105711f4afdea8c6d8d8':
Fix issue #1943927: need notification in status bar when adb is active
Merge commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890' into eclair-plus-aosp
* commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890':
Dialog titles would sometimes use a font too large.
Merge commit '1224c8830dee489436081cf18be49167b1aad2e6'
* commit '1224c8830dee489436081cf18be49167b1aad2e6':
[Issue 2099206] Encoding phone number prior to sending it to the phone lookup filter
Merge commit 'e1fd02400d69c059db2cc6299c893eba4096cc1d' into eclair-plus-aosp
* commit 'e1fd02400d69c059db2cc6299c893eba4096cc1d':
default dithering to ON (cheap, looks good)
Merge commit '84b4d37dd1e9269f73c2a9cacadcd88ec4256e3f' into eclair-plus-aosp
* commit '84b4d37dd1e9269f73c2a9cacadcd88ec4256e3f':
[Issue 2099206] Encoding phone number prior to sending it to the phone lookup filter
Some more tweaks and fixes to wallpapers. Make sure wallpapers are
told they are not visible when the screen is off. Add some new animations
for transitions across tasks, and fiddle with many of the existing
animations. Clean up the relationship between translucent activities
and animations. Add new API to start a PendingIntent from an
activity.
Change-Id: Ie0bf45fe44081bb6982c75361257a55d9cd9d863
Merge commit '52356ab108597dd6014fcf4eaad54b336fb95b67'
* commit '52356ab108597dd6014fcf4eaad54b336fb95b67':
Fix for bug # 2023074: settings db updater broken at version 34.
Merge commit '0cb94317d7460dadd4032a3596b27c9d03184941'
* commit '0cb94317d7460dadd4032a3596b27c9d03184941':
Add component name to informational logging in OMXCodec.cpp
Merge commit 'dc9555fb64b3fe53a06e7eabbf4a31018b9ee1ac' into eclair-plus-aosp
* commit 'dc9555fb64b3fe53a06e7eabbf4a31018b9ee1ac':
Fix for bug # 2023074: settings db updater broken at version 34.
Merge commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528' into eclair-plus-aosp
* commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528':
Add component name to informational logging in OMXCodec.cpp
Merge commit 'a1e3c40ce9a9647e3355b0343c38690ae0465752'
* commit 'a1e3c40ce9a9647e3355b0343c38690ae0465752':
Add timestamp support for call history vcard
Merge commit '2d3f9c559366ede6aefe9bcff554ef9c4eac21dd' into eclair-plus-aosp
* commit '2d3f9c559366ede6aefe9bcff554ef9c4eac21dd':
Add timestamp support for call history vcard
Merge commit '6f208f448c49792e1dae6b9866b2e812e48b3945'
* commit '6f208f448c49792e1dae6b9866b2e812e48b3945':
Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
Merge commit '26c131006c01a6034e75f7ebcc6f517ad9d1007a'
* commit '26c131006c01a6034e75f7ebcc6f517ad9d1007a':
Support for amr-wb tracks in MPEG4Extractor.
Merge commit 'b71e9b4e03f23d262f1ab665873f15e1a51e2a11'
* commit 'b71e9b4e03f23d262f1ab665873f15e1a51e2a11':
Added some more verbose output for AMR formats. Properly fill out the output format.
Merge commit '466dbbfd4595d714127a4bc92dd9235807b88be6' into eclair-plus-aosp
* commit '466dbbfd4595d714127a4bc92dd9235807b88be6':
Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
Merge commit '546f3cd579b80299307d82a769aca8e8f68484ec' into eclair-plus-aosp
* commit '546f3cd579b80299307d82a769aca8e8f68484ec':
Support for amr-wb tracks in MPEG4Extractor.
Merge commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993' into eclair-plus-aosp
* commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993':
Added some more verbose output for AMR formats. Properly fill out the output format.
Merge commit 'd43252a7b27a5a6966a51e8b35f5003f92c207fa'
* commit 'd43252a7b27a5a6966a51e8b35f5003f92c207fa':
Modify android.syncml.pim so that no one is going to use.
Merge commit '9183d361e0571b10e5ebbfac06eee5171f701da4'
* commit '9183d361e0571b10e5ebbfac06eee5171f701da4':
Make Phone.updateServiceLocation acquire a one-shot wake lock.
