Hyunyoung Song 38568aff22 Merge "Change Android default icon b/35314247 Test: manual" into oc-dev ...

am: bb4aeb19be

Change-Id: I7a80c68f227d2596f3863b9f234d31a7143ca33c

2017-06-07 09:04:17 +00:00

..

java

Merge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev am: 8d06d8cbf1" into oc-dev-plus-aosp

2017-06-07 03:58:45 +00:00

jni

Merge "ActivityManagerService: Add support for new stack dumping scheme."

2017-06-05 08:43:09 +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

Merge "Change Android default icon b/35314247 Test: manual" into oc-dev

2017-06-07 09:04:17 +00:00

tests

Merge "Move tests with private APIs to coretests"

2017-06-07 06:21:45 +00:00