Merge commit '95e022ec6a960cb34fa524ba7a57adfe92b6b48f'
* commit '95e022ec6a960cb34fa524ba7a57adfe92b6b48f':
Process: Add support for using scheduler policies instead of cgroups.
Merge commit '181b31a0d87d525ea64102a965210331e0c6885b' into eclair-plus-aosp
* commit '181b31a0d87d525ea64102a965210331e0c6885b':
Process: Add support for using scheduler policies instead of cgroups.
add documentation to notify developers about variable
camera specifications and add some more links
Change-Id: I46ef9811af17858cbc6547f88e626becb481b043
Merge commit '88e3f827e657ef741099b24896c17533fa9ef61e' into eclair-plus-aosp
* commit '88e3f827e657ef741099b24896c17533fa9ef61e':
Allow an alternate eri file.
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 '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 '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 'd43252a7b27a5a6966a51e8b35f5003f92c207fa'
* commit 'd43252a7b27a5a6966a51e8b35f5003f92c207fa':
Modify android.syncml.pim so that no one is going to use.
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.
- 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 '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.
Merge commit '55f8ac79bffc543ee2e2b486e0620bd73c36732a'
* commit '55f8ac79bffc543ee2e2b486e0620bd73c36732a':
API to combine LOOKUP_KEY and Contacts._ID together.
Merge commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3' into eclair-plus-aosp
* commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3':
API to combine LOOKUP_KEY and Contacts._ID together.
