Dianne Hackborn 064fab54d7 Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev

2013-04-10 21:15:15 +00:00

..

java

Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev

2013-04-10 21:15:15 +00:00

jni

Merge "Ensure that a canvas is always backed by some form of SkDevice." into jb-mr2-dev

2013-04-10 12:11:14 +00:00

res

Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

2013-04-10 19:36:55 +00:00

tests

Make download manager tests more reliable.

2013-04-09 15:08:43 -07:00