Craig Mautner 2e5528c5e0 Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-dev

2013-02-26 01:08:28 +00:00

..

java

Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-dev

2013-02-26 01:08:28 +00:00

jni

Merge "Fix SurfaceControl.setDisplaySurface() such that it accepts a null Surface" into jb-mr2-dev

2013-02-26 00:55:25 +00:00

res

Merge "Import translations. DO NOT MERGE"

2013-02-22 23:27:47 +00:00

tests

Merge "Clean up scan handling"

2013-02-22 18:40:24 +00:00