Merge commit '64d3f44c7bf5a6e80be419df5850ef60fec216b5'
* commit '64d3f44c7bf5a6e80be419df5850ef60fec216b5':
fix [2143798] Need to figure out how to do video
Merge commit 'a628d54d108b365b66934e4b83aac739ee5ad9cc'
* commit 'a628d54d108b365b66934e4b83aac739ee5ad9cc':
Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
Merge commit '33728557540d9033ff396f7a2ddd4fb304fdedcd'
* commit '33728557540d9033ff396f7a2ddd4fb304fdedcd':
Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Merge commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff'
* commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff':
Instead of a raw AIDL interface, give DropBox a Java
Merge commit '8071b14680f8081019ac1b995d7c7f09a8aeeba7' into eclair-mr2-plus-aosp
* commit '8071b14680f8081019ac1b995d7c7f09a8aeeba7':
Fix a race that kept the locale picker from working under heavy CPU load.
Merge commit 'ee507eb560319643946d73627bc7ad3e13591f2a' into eclair-mr2-plus-aosp
* commit 'ee507eb560319643946d73627bc7ad3e13591f2a':
Fix bug 2201417. Whenever the System setting that indicates
Merge commit 'c867958eb6fb50210a767fa24757bfa19228c22e' into eclair-mr2-plus-aosp
* commit 'c867958eb6fb50210a767fa24757bfa19228c22e':
A better solution for ignoring user activity while the screen is animating off.
Merge commit 'a2151b2b982cce5d424fdea2510ea9334a131475' into eclair-mr2-plus-aosp
* commit 'a2151b2b982cce5d424fdea2510ea9334a131475':
added GL test for textured lines
Merge commit '893cb4da1034870a8814394a1c3bdac10ca6cadf' into eclair-mr2-plus-aosp
* commit '893cb4da1034870a8814394a1c3bdac10ca6cadf':
fix [2143798] Need to figure out how to do video
Merge commit '5c24774de4a25797d8a4c3f4a25f2633939a1d1a' into eclair-mr2-plus-aosp
* commit '5c24774de4a25797d8a4c3f4a25f2633939a1d1a':
docs: fix broken link for download page.
Merge commit '102767cd3be39fd3865be02421fd1763f3ff33d5' into eclair-mr2-plus-aosp
* commit '102767cd3be39fd3865be02421fd1763f3ff33d5':
Explicitly specify that online-sdk depends on framework-res.
Merge commit '0b12dc3acaa5e6b2b0ac05374faf65a7e212ae4f' into eclair-mr2-plus-aosp
* commit '0b12dc3acaa5e6b2b0ac05374faf65a7e212ae4f':
Remove the activity restart between urls.
Merge commit '6373349836237abffc3de8a3632234170bc1cfca' into eclair-mr2-plus-aosp
* commit '6373349836237abffc3de8a3632234170bc1cfca':
Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
Merge commit '40946aa20183984fd60f2dbdc7708cf1c5431047' into eclair-mr2-plus-aosp
* commit '40946aa20183984fd60f2dbdc7708cf1c5431047':
Add SDK version for MR1.
Merge commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df' into eclair-mr2
* commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df':
Fix a race that kept the locale picker from working under heavy CPU load.
Merge commit '898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-mr2
* commit '898897338dfd62a268a89fb55ee900a9bd5a683f':
Fix bug 2201417. Whenever the System setting that indicates
Merge commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550' into eclair-mr2
* commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550':
A better solution for ignoring user activity while the screen is animating off.
Merge commit '7bde36e64e66c81f0150d0372e1357a31f4ec704' into eclair-mr2
* commit '7bde36e64e66c81f0150d0372e1357a31f4ec704':
added GL test for textured lines
Merge commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694' into eclair-mr2
* commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694':
fix [2143798] Need to figure out how to do video
Merge commit '4252244939089ce0b055456335071bb7f2c0d1c3' into eclair-mr2
* commit '4252244939089ce0b055456335071bb7f2c0d1c3':
docs: fix broken link for download page.
Merge commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35' into eclair-mr2
* commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35':
Explicitly specify that online-sdk depends on framework-res.
Merge commit 'aebcaec3c171f636a24051ce85ded2f86b09461b' into eclair-mr2
* commit 'aebcaec3c171f636a24051ce85ded2f86b09461b':
Remove the activity restart between urls.
Merge commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6' into eclair-mr2
* commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6':
Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
Merge commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e' into eclair-plus-aosp
* commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e':
When upgrading packages with shared user ids make sure we are eliminating
* changes:
When upgrading packages with shared user ids make sure we are eliminating the package about to be deleted or upgraded when updating permissions associated with the shared user. Include a simple null check when retrieving the permission.
the package about to be deleted or upgraded when updating permissions associated
with the shared user. Include a simple null check when retrieving the permission.
Fix PackageParser to avoid ArrayIndexOutOfBounds exceptions in several places
