OSDN Git Service
Victoria Lease [Wed, 8 May 2013 14:41:56 +0000 (07:41 -0700)]
am
acd341d8: Merge "OO NOT MERGE allow connected location providers location access" into jb-mr2-dev
* commit '
acd341d8682ca57c1066d664725ebc72f5ef10c1':
OO NOT MERGE allow connected location providers location access
Victoria Lease [Wed, 8 May 2013 14:40:15 +0000 (14:40 +0000)]
Merge "OO NOT MERGE allow connected location providers location access" into jb-mr2-dev
Jamie Gennis [Wed, 8 May 2013 01:23:20 +0000 (18:23 -0700)]
am
d28653df: Merge "Add the trace tag for Dalvik." into jb-mr2-dev
* commit '
d28653df6580b76559374580764aa2e86d6c2f48':
Add the trace tag for Dalvik.
Jamie Gennis [Wed, 8 May 2013 01:21:33 +0000 (01:21 +0000)]
Merge "Add the trace tag for Dalvik." into jb-mr2-dev
Alan Viverette [Wed, 8 May 2013 00:43:18 +0000 (17:43 -0700)]
am
239a0c0e: Ensure ViewRootImpl.setAccessibilityFocus() doesn\'t crash when reentrant.
* commit '
239a0c0e6a6fc36025fdb1c662e1c7acaec144bb':
Ensure ViewRootImpl.setAccessibilityFocus() doesn't crash when reentrant.
Alan Viverette [Wed, 8 May 2013 00:17:35 +0000 (17:17 -0700)]
Ensure ViewRootImpl.setAccessibilityFocus() doesn't crash when reentrant.
Internal state must be cleared before calling any methods on the focus
host, since the method may be called again from the host and attempt to
recycle the same AccessibilityNodeInfo twice.
BUG:
8856860
Change-Id: I0410989fd6f3ce3ce29de8edebdfbf3847188843
Xavier Ducrohet [Tue, 7 May 2013 23:13:25 +0000 (16:13 -0700)]
am
81a8bb1c: am
0974061e: (-s ours) am
1181564f: am
42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
* commit '
81a8bb1ca9df314faf6de09cc2da0a1db70c7391':
DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
Xavier Ducrohet [Tue, 7 May 2013 23:12:14 +0000 (16:12 -0700)]
am
0974061e: (-s ours) am
1181564f: am
42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
* commit '
0974061e941f3aa8c3c5c71ca996be5f93a6a865':
DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
Xavier Ducrohet [Tue, 7 May 2013 23:05:58 +0000 (16:05 -0700)]
am
1181564f: am
42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
* commit '
1181564fc482171c4c9a84b3c7c1f06ca6eaf2b6':
DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
Xavier Ducrohet [Tue, 7 May 2013 23:03:31 +0000 (16:03 -0700)]
am
42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
* commit '
42fb3abd4b7463626983c1a2768788c901f2e71a':
DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
Jeff Tinker [Tue, 7 May 2013 22:38:40 +0000 (15:38 -0700)]
am
02f7f449: Merge "Correct java API docs for MediaDrm offline use case" into jb-mr2-dev
* commit '
02f7f449739ae3429b0bf834cebcb2b1bcade8c1':
Correct java API docs for MediaDrm offline use case
Xavier Ducrohet [Fri, 21 Dec 2012 17:54:02 +0000 (09:54 -0800)]
DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
Add single crunch command to aapt. do not merge.
Previously the crunch command would work on a full res folder
and output a full res folder (with only the drawables). This
was only used in the SDK.
The incremental logic is moved to the SDK build system so we
change the crunch command (or rather add a new one) to only
crunch a single file.
(cherry picked from commit
b1f6ad82dd8d1702617a757a88430604b3131fac)
Change-Id: Ifa0dceed93708658f950322f36c13b6ebe7ab0f3
Jeff Tinker [Tue, 7 May 2013 22:36:50 +0000 (22:36 +0000)]
Merge "Correct java API docs for MediaDrm offline use case" into jb-mr2-dev
Victoria Lease [Tue, 7 May 2013 21:22:02 +0000 (14:22 -0700)]
OO NOT MERGE allow connected location providers location access
Cherry-pick of I0c383eb82ed041e57a7d32321df2d67b462d4e21 from master
Oops, it seems the fused location provider was being denied access
to locations when any user other than the primary device owner is
logged in. This was breaking the fused location provider entirely
for all secondary users of a given device.
Bug:
8766225
Change-Id: Ic0db5f2094828c897a405abb0dca6ac39a2ca526
Jamie Gennis [Tue, 7 May 2013 22:22:31 +0000 (15:22 -0700)]
Add the trace tag for Dalvik.
Bug:
8856374
Change-Id: Id0fbdb8f7a487c5831edcd2c6c64a7da63aec03d
Jeff Tinker [Tue, 7 May 2013 21:51:17 +0000 (14:51 -0700)]
Correct java API docs for MediaDrm offline use case
Documentation only change, no APIs are affected
Change-Id: I4f3978751928de503f51afa77e0983d4c385ff7b
related-to-bug:
8621588
Robert Greenwalt [Tue, 7 May 2013 20:48:49 +0000 (13:48 -0700)]
am
e2322bdd: Merge "Don\'t back up the scan-always setting." into jb-mr2-dev
* commit '
e2322bdd7865552aa31f93bbf4e60d4d9a7d0973':
Don't back up the scan-always setting.
Robert Greenwalt [Tue, 7 May 2013 20:45:03 +0000 (20:45 +0000)]
Merge "Don't back up the scan-always setting." into jb-mr2-dev
Robert Greenwalt [Tue, 7 May 2013 19:33:15 +0000 (12:33 -0700)]
Don't back up the scan-always setting.
We ask the user during device setup to configure this setting -
if we then restore from backup we clobber what they just selected.
Instead, just let them chose during setup and don't back it up.
bug:
8825150
Change-Id: I3f2b2291c86a4008bb8ea2468164d9c6c673cbb0
Craig Mautner [Tue, 7 May 2013 19:32:50 +0000 (12:32 -0700)]
am
84ce55cf: Merge "Don\'t limit the overscan frame to the window frame." into jb-mr2-dev
* commit '
84ce55cfd50bdfc7054de5ee9f69de7cf08b61ae':
Don't limit the overscan frame to the window frame.
Craig Mautner [Tue, 7 May 2013 19:24:56 +0000 (19:24 +0000)]
Merge "Don't limit the overscan frame to the window frame." into jb-mr2-dev
Zhentao Sun [Tue, 7 May 2013 18:44:46 +0000 (11:44 -0700)]
am
aa64548d: Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev
* commit '
aa64548d9f7ee0d3378bc62657e0b86d486038d6':
Fixed unreleased wake lock isues and NPE.
Zhentao Sun [Tue, 7 May 2013 18:43:24 +0000 (18:43 +0000)]
Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev
Craig Mautner [Tue, 7 May 2013 18:41:27 +0000 (11:41 -0700)]
Don't limit the overscan frame to the window frame.
Fixes bug
8829372.
Change-Id: I803ae60fcc38649c0a7a9cb39429333755e47e2b
Scott Main [Tue, 7 May 2013 17:25:11 +0000 (10:25 -0700)]
Scott Main [Tue, 7 May 2013 17:23:17 +0000 (10:23 -0700)]
am
9207be90: am
b80b4bfd: am
3c8ecd30: am
b2606b3f: am
c98612a9: some more search tags
* commit '
9207be9078a59ecd93073e6892c5c75b47b342d6':
some more search tags
Scott Main [Tue, 7 May 2013 17:20:58 +0000 (10:20 -0700)]
am
b80b4bfd: am
3c8ecd30: am
b2606b3f: am
c98612a9: some more search tags
* commit '
b80b4bfdae8d9eb7e8ad6c7a44f92d9fd2b9e6d9':
some more search tags
Scott Main [Tue, 7 May 2013 17:19:04 +0000 (10:19 -0700)]
am
3c8ecd30: am
b2606b3f: am
c98612a9: some more search tags
* commit '
3c8ecd30b41511b84c13c341e2b471a81e19e875':
some more search tags
Scott Main [Tue, 7 May 2013 17:16:40 +0000 (10:16 -0700)]
am
b2606b3f: am
c98612a9: some more search tags
* commit '
b2606b3fe8906fb14db07b5dc099ff0b52db4c29':
some more search tags
Scott Main [Tue, 7 May 2013 17:15:11 +0000 (10:15 -0700)]
am
c98612a9: some more search tags
* commit '
c98612a9b2293f8ae29389dd484d7b384c7d37ad':
some more search tags
Scott Main [Wed, 24 Apr 2013 18:43:41 +0000 (11:43 -0700)]
some more search tags
Change-Id: Id48d3214619e5d860e39e8f1d9d814e17956feb1
Romain Guy [Tue, 7 May 2013 02:09:25 +0000 (19:09 -0700)]
am
4c95c537: Merge "Optimize list view scrolls Bug #
8108706" into jb-mr2-dev
* commit '
4c95c5377a75a3d6c5f3ed8b09a56071d51fadb1':
Optimize list view scrolls Bug #
8108706
Romain Guy [Tue, 7 May 2013 02:05:37 +0000 (02:05 +0000)]
Merge "Optimize list view scrolls Bug #
8108706" into jb-mr2-dev
Dirk Dougherty [Tue, 7 May 2013 01:51:11 +0000 (18:51 -0700)]
am
a6303d8a: am
67430e8e: am
2e52e815: am
6b6fd9d1: am
36aa2759: am
b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.
* commit '
a6303d8a211543a8e1f5fd2425024a1c4d0f88ff':
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
Dirk Dougherty [Tue, 7 May 2013 01:49:14 +0000 (18:49 -0700)]
am
67430e8e: am
2e52e815: am
6b6fd9d1: am
36aa2759: am
b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.
* commit '
67430e8ec735c83f1f3304da7037e518aef6128a':
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
Dirk Dougherty [Tue, 7 May 2013 01:47:29 +0000 (18:47 -0700)]
am
2e52e815: am
6b6fd9d1: am
36aa2759: am
b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.
* commit '
2e52e815b009fcabb407b9bd0363e0eced6c0229':
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
Dirk Dougherty [Tue, 7 May 2013 01:44:53 +0000 (18:44 -0700)]
am
6b6fd9d1: am
36aa2759: am
b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.
* commit '
6b6fd9d1f0c829b1bd23c776b98f564848731ea2':
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
Dirk Dougherty [Tue, 7 May 2013 01:43:20 +0000 (18:43 -0700)]
am
36aa2759: am
b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.
* commit '
36aa2759998cbfff7e5baff8b422cbeebd95d5db':
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
Romain Guy [Tue, 7 May 2013 01:42:08 +0000 (18:42 -0700)]
Optimize list view scrolls
Bug #
8108706
Change-Id: I8679b584132e82b7bb3301a38800de4ddfc57be6
Dirk Dougherty [Tue, 7 May 2013 01:41:31 +0000 (18:41 -0700)]
am
b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.
* commit '
b582c678c88df2848023b7f27f4bc0ab2249e1e1':
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
Dirk Dougherty [Sat, 4 May 2013 17:54:52 +0000 (10:54 -0700)]
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
Change-Id: Ie390d2bbd8abc0d063c1f313797e8c3d21d27490
Scott Main [Tue, 7 May 2013 00:44:33 +0000 (17:44 -0700)]
am
a4d7214d: am
12829256: am
13ae720b: am
e7ae74f1: am
5bde4bc5: am
1cd65b30: delete a few unused/obsolete files and add redirects
* commit '
a4d7214dbebfbab151023bea52b5dfe166b058e0':
delete a few unused/obsolete files and add redirects
Scott Main [Tue, 7 May 2013 00:33:52 +0000 (17:33 -0700)]
am
12829256: am
13ae720b: am
e7ae74f1: am
5bde4bc5: am
1cd65b30: delete a few unused/obsolete files and add redirects
* commit '
1282925654f82e6df7a1fb0503de36ee951c126d':
delete a few unused/obsolete files and add redirects
Scott Main [Tue, 7 May 2013 00:27:26 +0000 (17:27 -0700)]
am
13ae720b: am
e7ae74f1: am
5bde4bc5: am
1cd65b30: delete a few unused/obsolete files and add redirects
* commit '
13ae720b46ef657ec866fd4e82c5550a02427ee3':
delete a few unused/obsolete files and add redirects
Scott Main [Tue, 7 May 2013 00:20:59 +0000 (17:20 -0700)]
am
e7ae74f1: am
5bde4bc5: am
1cd65b30: delete a few unused/obsolete files and add redirects
* commit '
e7ae74f1b890035ad1a8efdb9292f1dcd83aa3e2':
delete a few unused/obsolete files and add redirects
Scott Main [Tue, 7 May 2013 00:18:57 +0000 (17:18 -0700)]
am
5bde4bc5: am
1cd65b30: delete a few unused/obsolete files and add redirects
* commit '
5bde4bc5c7ea442a5940658d17a03f1a5010450c':
delete a few unused/obsolete files and add redirects
Scott Main [Tue, 7 May 2013 00:16:26 +0000 (17:16 -0700)]
am
1cd65b30: delete a few unused/obsolete files and add redirects
* commit '
1cd65b30904b07ae4226a6e438647ee3b63d7950':
delete a few unused/obsolete files and add redirects
Scott Main [Tue, 7 May 2013 00:06:40 +0000 (17:06 -0700)]
am
05759d15: Merge "add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug:
8746126" into jb-mr2-dev
* commit '
05759d1531f4e36b51f386fa884454eeda88ecb8':
add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug:
8746126
Scott Main [Mon, 6 May 2013 23:56:40 +0000 (23:56 +0000)]
Merge "add notice to not use 0 in startForeground(). also delete some obsolete back-compat tips for <=donut bug:
8746126" into jb-mr2-dev
Scott Main [Mon, 6 May 2013 23:51:39 +0000 (16:51 -0700)]
delete a few unused/obsolete files and add redirects
Change-Id: Icbcb0f042ac5f05d17d42be4c5c122316e93b866
Jesse Hall [Mon, 6 May 2013 23:48:19 +0000 (16:48 -0700)]
am
2787ba25: Merge "Register EGLExt JNI methods" into jb-mr2-dev
* commit '
2787ba25fdc4141e74e649922cf982d3f6c0168d':
Register EGLExt JNI methods
Dianne Hackborn [Mon, 6 May 2013 23:48:16 +0000 (16:48 -0700)]
am
d43a71da: Merge "Help for the debugging help for issue #
8734824." into jb-mr2-dev
* commit '
d43a71dad80dfca65b0758f4333360516f6ad300':
Help for the debugging help for issue #
8734824.
Jesse Hall [Mon, 6 May 2013 23:46:59 +0000 (23:46 +0000)]
Merge "Register EGLExt JNI methods" into jb-mr2-dev
Dianne Hackborn [Mon, 6 May 2013 23:46:57 +0000 (23:46 +0000)]
Merge "Help for the debugging help for issue #
8734824." into jb-mr2-dev
Dianne Hackborn [Mon, 6 May 2013 23:07:26 +0000 (16:07 -0700)]
Help for the debugging help for issue #
8734824.
Add a new "hang" am command that lets you hang the system
process. Useful for testing.
Change-Id: Ice0fc52b49d80e5189f016108b03f9fd549b58a7
Christopher Tate [Mon, 6 May 2013 22:21:04 +0000 (15:21 -0700)]
am
06548798: am
2ad68f7d: am
04d61410: am
dfb33b86: am
fcfc99c0: am
f7918b4a: am
d3a57029: am
1b0c9c95: am
81c1d8d3: Ensure install-during-restore is like install-then-restore
* commit '
06548798f5b03b552d27e956da094effb70ee570':
Ensure install-during-restore is like install-then-restore
Christopher Tate [Mon, 6 May 2013 22:19:41 +0000 (15:19 -0700)]
am
2ad68f7d: am
04d61410: am
dfb33b86: am
fcfc99c0: am
f7918b4a: am
d3a57029: am
1b0c9c95: am
81c1d8d3: Ensure install-during-restore is like install-then-restore
* commit '
2ad68f7d261a1dbc749f6e322b1e84a1288087bd':
Ensure install-during-restore is like install-then-restore
Christopher Tate [Mon, 6 May 2013 22:17:36 +0000 (15:17 -0700)]
am
04d61410: am
dfb33b86: am
fcfc99c0: am
f7918b4a: am
d3a57029: am
1b0c9c95: am
81c1d8d3: Ensure install-during-restore is like install-then-restore
* commit '
04d6141033c66a1777ba0c66d67a7540e4c3e89c':
Ensure install-during-restore is like install-then-restore
Christopher Tate [Mon, 6 May 2013 22:16:03 +0000 (15:16 -0700)]
am
dfb33b86: am
fcfc99c0: am
f7918b4a: am
d3a57029: am
1b0c9c95: am
81c1d8d3: Ensure install-during-restore is like install-then-restore
* commit '
dfb33b860f0c936d8af6555835da0ef1aea6c870':
Ensure install-during-restore is like install-then-restore
Christopher Tate [Mon, 6 May 2013 22:14:27 +0000 (15:14 -0700)]
am
fcfc99c0: am
f7918b4a: am
d3a57029: am
1b0c9c95: am
81c1d8d3: Ensure install-during-restore is like install-then-restore
* commit '
fcfc99c064f0b91fa419784bd90bb9944b9ab9f4':
Ensure install-during-restore is like install-then-restore
Kenny Root [Mon, 6 May 2013 22:13:58 +0000 (15:13 -0700)]
am
cd1de394: Merge "Track change in NativeCrypto"
* commit '
cd1de3940d9c389b6e69a7040c67d3abb8458ad2':
Track change in NativeCrypto
Christopher Tate [Mon, 6 May 2013 22:12:07 +0000 (15:12 -0700)]
am
f7918b4a: am
d3a57029: am
1b0c9c95: am
81c1d8d3: Ensure install-during-restore is like install-then-restore
* commit '
f7918b4a1e06350ba4d69fe47327db830cd4e8ba':
Ensure install-during-restore is like install-then-restore
Kenny Root [Mon, 6 May 2013 22:02:20 +0000 (22:02 +0000)]
Merge "Track change in NativeCrypto"
Kenny Root [Mon, 6 May 2013 22:00:58 +0000 (15:00 -0700)]
Track change in NativeCrypto
Change-Id: Ic04d4ac5218795fc226f1751b6ae4db1ae73a930
Christopher Tate [Mon, 6 May 2013 22:00:53 +0000 (15:00 -0700)]
am
d3a57029: am
1b0c9c95: am
81c1d8d3: Ensure install-during-restore is like install-then-restore
* commit '
d3a57029e80073aa3c7dfe1dbc8945d32968f6ae':
Ensure install-during-restore is like install-then-restore
Christopher Tate [Mon, 6 May 2013 21:59:40 +0000 (14:59 -0700)]
am
1b0c9c95: am
81c1d8d3: Ensure install-during-restore is like install-then-restore
* commit '
1b0c9c95dc72ebeb8af73bc3ff44c313ebd788f4':
Ensure install-during-restore is like install-then-restore
Christopher Tate [Mon, 6 May 2013 21:53:10 +0000 (14:53 -0700)]
am
81c1d8d3: Ensure install-during-restore is like install-then-restore
* commit '
81c1d8d3a5aef6a423f0bb02de1b362b2f2d12df':
Ensure install-during-restore is like install-then-restore
Christopher Tate [Mon, 6 May 2013 20:07:05 +0000 (13:07 -0700)]
Ensure install-during-restore is like install-then-restore
When we've installed an apk from the archive, recheck whether
to apply the system-uid policy restrictions around file system
restores.
Bug
8833099
(cherry picked from commit
2baf6dcfcf7fc1705db25e64dc0cb11fa3509d39)
Change-Id: I972fe1543f2234aa76baf562d6f806175ac0248e
Christopher Tate [Mon, 6 May 2013 21:25:10 +0000 (14:25 -0700)]
am
e242c731: Merge "Ensure install-during-restore is like install-then-restore" into jb-mr2-dev
* commit '
e242c731f2288a615d54f329cdeb16157d4c15ea':
Ensure install-during-restore is like install-then-restore
Christopher Tate [Mon, 6 May 2013 21:12:40 +0000 (21:12 +0000)]
Merge "Ensure install-during-restore is like install-then-restore" into jb-mr2-dev
Elliott Hughes [Mon, 6 May 2013 21:04:34 +0000 (14:04 -0700)]
am
601afaef: Merge "Someone\'s IDE chose the wrong Date."
* commit '
601afaef5220aef928a9235e50376c462538a942':
Someone's IDE chose the wrong Date.
Dianne Hackborn [Mon, 6 May 2013 20:47:04 +0000 (13:47 -0700)]
am
5b88a2fd: Debugging help for issue #
8734824: WATCHDOG KILLING SYSTEM PROCESS
* commit '
5b88a2fd7b77880f6e09ae4a1de509bebe28bc3a':
Debugging help for issue #
8734824: WATCHDOG KILLING SYSTEM PROCESS
Elliott Hughes [Mon, 6 May 2013 20:29:09 +0000 (20:29 +0000)]
Merge "Someone's IDE chose the wrong Date."
Christopher Tate [Mon, 6 May 2013 20:07:05 +0000 (13:07 -0700)]
Ensure install-during-restore is like install-then-restore
When we've installed an apk from the archive, recheck whether
to apply the system-uid policy restrictions around file system
restores.
Bug
8833099
Change-Id: Ifa1b5877673a0d6ca6acf94e60f314fd0dda008c
Jesse Hall [Mon, 6 May 2013 18:36:57 +0000 (11:36 -0700)]
Register EGLExt JNI methods
Bug:
8678160
Change-Id: I8ecd2e6da2aee250b3433be18fff6af927b02994
Zhentao Sun [Mon, 6 May 2013 18:22:44 +0000 (11:22 -0700)]
Fixed unreleased wake lock isues and NPE.
Fixed b/
8834502. Wake lock might not be released when the callback is null.
NPE is thrown when the callback is null in some cases too.
Change-Id: I27d3af810669e446cfb57aba8715c80cba3e15e7
Dianne Hackborn [Fri, 3 May 2013 23:25:11 +0000 (16:25 -0700)]
Debugging help for issue #
8734824: WATCHDOG KILLING SYSTEM PROCESS
IActivityController has a new callback which the Watchdog calls
when it detects that the system process is hung. This may be
use full monkey. All hail the monkey!
Also add a new private feature to Binder to be able to turn off
all incoming dump() calls to a process. The watchdog uses this
when it reports it is hung, so that if someone, say, wants to
collect a bug report at this point they won't get stuck waiting
for things that are all busted.
Change-Id: Ib514d97451cf3b93f29e194c1954e29f948c13b1
Baligh Uddin [Mon, 6 May 2013 18:12:13 +0000 (11:12 -0700)]
am
996f6b04: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
996f6b048ba03ca727c40e1bc33100bf45c93518':
Import translations. DO NOT MERGE
Robert Greenwalt [Mon, 6 May 2013 18:12:02 +0000 (11:12 -0700)]
am
341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-dev
* commit '
341666c40d222145f7dfd44bdbed48590c4dc5da':
Fix sync problem in NsdManager
Michael Jurka [Mon, 6 May 2013 18:11:54 +0000 (11:11 -0700)]
am
72f2a7af: Merge "Fix bug where thumbnails in Recents disappear" into jb-mr2-dev
* commit '
72f2a7af828056fc426d936c1d40cb6bbdbdf7c7':
Fix bug where thumbnails in Recents disappear
Dave Burke [Mon, 6 May 2013 18:11:51 +0000 (11:11 -0700)]
am
236cc476: Temporarily revert field name change (DO NOT MERGE)
* commit '
236cc476e6792a11502ba4f40c7ab4586f40d282':
Temporarily revert field name change (DO NOT MERGE)
Dirk Dougherty [Mon, 6 May 2013 18:11:27 +0000 (11:11 -0700)]
am
96f69cbe: am
20860a3f: am
79ebe80a: am
e34ecc9a: am
3dbb173e: am
c3a7ea42: Doc change: Update landing pages for Google Play Services.
* commit '
96f69cbec3112e87e9d7bc451bf142a6e6918113':
Doc change: Update landing pages for Google Play Services.
Jesse Hall [Mon, 6 May 2013 18:11:21 +0000 (11:11 -0700)]
am
02b7128f: Merge "Add android.opengl.EGLExt class for EGL extensions" into jb-mr2-dev
* commit '
02b7128f87ce55693cb6401ab09a5e47b5db5cb5':
Add android.opengl.EGLExt class for EGL extensions
Romain Guy [Mon, 6 May 2013 18:11:12 +0000 (11:11 -0700)]
am
fdf13c90: Merge "Convert alpha from [0..1] to [0.255] range Bug #
8808886" into jb-mr2-dev
* commit '
fdf13c90cb6b412dd93ae6a8990bf962e0d71407':
Convert alpha from [0..1] to [0.255] range Bug #
8808886
Chet Haase [Mon, 6 May 2013 18:11:09 +0000 (11:11 -0700)]
am
d65eebf4: Merge "Fix scaled-view droppings artifact" into jb-mr2-dev
* commit '
d65eebf4d97dd3812f02e7755e5b399c27e49f71':
Fix scaled-view droppings artifact
Fabrice Di Meglio [Mon, 6 May 2013 18:11:03 +0000 (11:11 -0700)]
am
8c2e3a41: Merge "Optimize RTL properties resolution" into jb-mr2-dev
* commit '
8c2e3a412aaee8359a48265a101ca27e7b67301c':
Optimize RTL properties resolution
Svetoslav [Mon, 6 May 2013 18:10:57 +0000 (11:10 -0700)]
am
faa47b52: Merge "Idle maintenance scheduling broken." into jb-mr2-dev
* commit '
faa47b526fc35be01b1bc46a78679adde87f6701':
Idle maintenance scheduling broken.
Baligh Uddin [Mon, 6 May 2013 18:07:30 +0000 (18:07 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Elliott Hughes [Mon, 6 May 2013 17:53:28 +0000 (10:53 -0700)]
Someone's IDE chose the wrong Date.
Part 1 of the mystery of the java.sql.Date in preloaded-classes solved.
Change-Id: I33fffec1f86e34167a76afc839d9f4ce31fa31f7
Robert Greenwalt [Mon, 6 May 2013 16:37:44 +0000 (16:37 +0000)]
Merge "Fix sync problem in NsdManager" into jb-mr2-dev
Baligh Uddin [Mon, 6 May 2013 16:35:57 +0000 (09:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibceb0c93f3886cc191b9cd7d2fe026fb0d39c5da
Auto-generated-cl: translation import
Svetoslav Ganov [Mon, 6 May 2013 15:44:49 +0000 (08:44 -0700)]
am
62159c0d: Merge "Multiple bindings to the same accessiblity serice if it dies." into jb-mr2-dev
* commit '
62159c0d854737f8dc519fba01fd28adea26e57f':
Multiple bindings to the same accessiblity serice if it dies.
Dianne Hackborn [Mon, 6 May 2013 15:44:47 +0000 (08:44 -0700)]
am
d3956321: Merge "Fix issue #
8798662: NPE in..." into jb-mr2-dev
* commit '
d3956321c173beb1fb096b5171e76ba7b7e1bc1e':
Fix issue #
8798662: NPE in...
Adam Powell [Mon, 6 May 2013 15:44:33 +0000 (08:44 -0700)]
am
2b662e8e: Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev
* commit '
2b662e8ef96c645e38a3debc29afa7454664f6cb':
Fix a NPE in MenuItemImpl when setting null ActionProvider
quddusc [Mon, 6 May 2013 15:44:31 +0000 (08:44 -0700)]
am
5d3e89be: am
d6aa68b6: am
564a533e: am
66442b56: am
775deb88: am
9af97443: Merge "docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71" into jb-mr
* commit '
5d3e89beb090cdfa1e305025a4e10f0591b2fa66':
docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71
Michael Jurka [Mon, 6 May 2013 11:42:22 +0000 (11:42 +0000)]
Merge "Fix bug where thumbnails in Recents disappear" into jb-mr2-dev
Dave Burke [Mon, 6 May 2013 02:46:33 +0000 (19:46 -0700)]
Temporarily revert field name change (DO NOT MERGE)
VisualOn is using hidden fields, causing HBO and Xfinity to crash.
Bug:
8549617
Bug:
8331866
Change-Id: I35a9fe66dea8d56f4fcff9b492679226a17f4acc
Dirk Dougherty [Sat, 4 May 2013 19:01:07 +0000 (12:01 -0700)]
am
20860a3f: am
79ebe80a: am
e34ecc9a: am
3dbb173e: am
c3a7ea42: Doc change: Update landing pages for Google Play Services.
* commit '
20860a3f8b6a37719fc59fce1b1267b92efef5a3':
Doc change: Update landing pages for Google Play Services.
Dirk Dougherty [Sat, 4 May 2013 18:58:43 +0000 (11:58 -0700)]
am
79ebe80a: am
e34ecc9a: am
3dbb173e: am
c3a7ea42: Doc change: Update landing pages for Google Play Services.
* commit '
79ebe80a85ce97e3278f51e11086a2b89e09f86d':
Doc change: Update landing pages for Google Play Services.
Jesse Hall [Sat, 4 May 2013 17:50:48 +0000 (17:50 +0000)]
Merge "Add android.opengl.EGLExt class for EGL extensions" into jb-mr2-dev