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.
Merge commit '2a6bd01548cb24f1d173d8b22efbafe8b097ecda'
* commit '2a6bd01548cb24f1d173d8b22efbafe8b097ecda':
Handle cases where TYPE can be undefined, such as EAS.
Merge commit 'df4edc807ca32419118a9b86a3d68b0fac02f5fa' into eclair-plus-aosp
* commit 'df4edc807ca32419118a9b86a3d68b0fac02f5fa':
Modify android.syncml.pim so that no one is going to use.
Merge commit 'a8cdbc85c003eae8c1b7178fcd70f8bc711aed96' into eclair-plus-aosp
* commit 'a8cdbc85c003eae8c1b7178fcd70f8bc711aed96':
Make Phone.updateServiceLocation acquire a one-shot wake lock.
Phone.updateServiceLocation() is the internal routine triggered by
external calls to CellLocation.requestLocationUpdate().
addresses bug http://b/issue?id=1724246
Change-Id: Id3d5cab1a77df12d3e94373a58ae94688a8630c6
- Remove android.syncml.pim.vcalendar since no one is using it.
-- We have android.pim.ICalendar.java, so handling vCalendar (== ICalendar) is possble without android.syncml.pim
- Mark android.syncml.pim.vcard and related code as obsolete.
-- Refactored version is in android.pim.vcard, which supports new Contacts database schema.
Related issue: 2110530
Merge commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017' into eclair-plus-aosp
* commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017':
Handle cases where TYPE can be undefined, such as EAS.
Merge commit '7ca8cacd8035989c4b0a71787f76ffac9dd9e9f1'
* commit '7ca8cacd8035989c4b0a71787f76ffac9dd9e9f1':
add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition
Merge commit '24d237db943051942b5966f5e788d67050ec0ba5' into eclair-plus-aosp
* commit '24d237db943051942b5966f5e788d67050ec0ba5':
add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition
Merge commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342' into eclair-plus-aosp
* commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342':
Do not die when printing empty prefs.
Merge commit '67af9f5bf1abdaeedbdf21c1de9502d33de8f16f' into eclair-plus-aosp
* commit '67af9f5bf1abdaeedbdf21c1de9502d33de8f16f':
Fixed the fastscroll thumb asset in hdpi.
