Merge commit 'f0e66e55a3e1d87d7cf68f699a0c4168faf4cf60'
* commit 'f0e66e55a3e1d87d7cf68f699a0c4168faf4cf60':
Set intent_component of in-app shortcuts to app itself
Merge commit 'f97f436ed6e14a680cef88a5a61b0b06f847a107' into eclair-plus-aosp
* commit 'f97f436ed6e14a680cef88a5a61b0b06f847a107':
Set intent_component of in-app shortcuts to app itself
Fixes http://b/issue?id=2130474
"Shortcuts created by pivoted-in search do not
have intent_component_name set"
Change-Id: I702fe39348b762393ed08ce9905771eb892bf782
Merge commit '4fe6f603cafd2f1b54051809182c308a4077b783'
* commit '4fe6f603cafd2f1b54051809182c308a4077b783':
Send the UUID intent even if apps have not requested for it.
Merge commit '718970bcf35252451ae15a326bd897b436ba93f3' into eclair-plus-aosp
* commit '718970bcf35252451ae15a326bd897b436ba93f3':
Send the UUID intent even if apps have not requested for it.
Merge commit '09481271507cfac0db2f27b878f4a453ed919fb1'
* commit '09481271507cfac0db2f27b878f4a453ed919fb1':
Track CPU speed stepping to get more accurate CPU cost per app.
Merge commit '5ea916b17cf0071f4d49936a370f4b873e4eb3e3' into eclair-plus-aosp
* commit '5ea916b17cf0071f4d49936a370f4b873e4eb3e3':
Track CPU speed stepping to get more accurate CPU cost per app.
Merge commit 'ffe1cf251a4f8469695b8acfa37270684dc1b70c' into eclair-plus-aosp
* commit 'ffe1cf251a4f8469695b8acfa37270684dc1b70c':
Unhide Camera lock and unlock API.
This will help apps listening to this intent to update icons etc
if the remote uuid changes. For example, the settings app used to
refresh the icons when the class bits change. It can do it now
when the remote ends uuids changes too.
Change-Id: Ib9af45780e83118d8877b0ef16f5b39b87fb4bef
More CPU speed stepping happening with newer devices, so we need
to qualify CPU time with the CPU speed, since power consumption
varies greatly by speed. Apps that peg the CPU should get a higher
penaltly.
Also, fix for 2062930: NPE at VolumePreference.onKey()
Merge commit 'f4d3e93e94382ad30047e0d3ed315aae76b2d177'
* commit 'f4d3e93e94382ad30047e0d3ed315aae76b2d177':
Fix issue #1862317: Browser does not appear to honor anchors (#es) in links
Merge commit '238dc72f742efd8b9d87dc66c38c304cd6e0399c' into eclair-plus-aosp
* commit '238dc72f742efd8b9d87dc66c38c304cd6e0399c':
Fix issue #1862317: Browser does not appear to honor anchors (#es) in links
Merge commit '358d4aa1e4b4282b7637fec24364ab286358c451'
* commit '358d4aa1e4b4282b7637fec24364ab286358c451':
Fix 2092386: Support yuyv for camera preview format.
Merge commit 'c0df3a473f6973cf32b343a886dd62559a4b93c7' into eclair-plus-aosp
* commit 'c0df3a473f6973cf32b343a886dd62559a4b93c7':
Fix 2092386: Support yuyv for camera preview format.
Merge commit '23bd5042ca6806995e019ea997f73740c754df9e'
* commit '23bd5042ca6806995e019ea997f73740c754df9e':
handle calendars with an access level of "root"
Merge commit '7d9db612bdecad3d6667858ac296f5ede27aabfa' into eclair-plus-aosp
* commit '7d9db612bdecad3d6667858ac296f5ede27aabfa':
handle calendars with an access level of "root"
Merge commit '9122a49cd68ab2a472516c568298699f376bf80a'
* commit '9122a49cd68ab2a472516c568298699f376bf80a':
Don't back up / restore certain sync-related settings
Merge commit 'd163f4babe101b89aaf322c34d3bafeae237f7da' into eclair-plus-aosp
* commit 'd163f4babe101b89aaf322c34d3bafeae237f7da':
Don't back up / restore certain sync-related settings
Merge commit '3bd5e2b22efe0da3864bc6d8c5aae68742c3c707'
* commit '3bd5e2b22efe0da3864bc6d8c5aae68742c3c707':
Add better APIs for the battery status, and other cleanup.
Merge commit 'e69335f8b4f4195e57613fe6b83e18e23e0c2760' into eclair-plus-aosp
* commit 'e69335f8b4f4195e57613fe6b83e18e23e0c2760':
Add better APIs for the battery status, and other cleanup.
Merge commit 'b7b083090f7312f83453e3f3c2e40a91644a3059'
* commit 'b7b083090f7312f83453e3f3c2e40a91644a3059':
Add API to send an ordered sticky broadcast.
Merge commit 'a382cb81187437aa389dc131687e181ceaefa8ba' into eclair-plus-aosp
* commit 'a382cb81187437aa389dc131687e181ceaefa8ba':
Add API to send an ordered sticky broadcast.
Merge commit 'ac810e53b70aa01c148c998c57f6888160e1557a' into eclair-plus-aosp
* commit 'ac810e53b70aa01c148c998c57f6888160e1557a':
Add new API for fetching UUIDs using SDP.
Add new API which clients can use to force an SDP query.
The result is broadcast using an intent having the UUIDs.
The intent is broadcast after a timeout, in case of an error.
This timeout is greater than the page timeout.
Change-Id: I61e6db4c05b34c42f679a66987e37e2063a793b6
