Wale Ogunwale a96a9f7326 Merge "Added 'dumpsys activity lastanr'" into oc-dev ...

am: b32fecd6e0

Change-Id: Iede7911ea687b7890833ee967da010db6041fb49

2017-06-10 16:05:53 +00:00

..

java

Merge "Added 'dumpsys activity lastanr'" into oc-dev

2017-06-10 16:05:53 +00:00

jni

Merge "Fix CTS : BitmapRGBAF16Test#testSetPixel failure" into oc-dr1-dev

2017-06-09 06:34:42 +00:00

proto/android

Prune unused static libs and instant apps if space needed am: f36d53cbfc

2017-05-31 03:59:35 +00:00

res

Import translations. DO NOT MERGE

2017-06-09 17:37:30 -07:00

tests

Merge changes from topic 'battery_smear_move' into oc-dev

2017-06-09 20:50:47 +00:00