Jack He 45c074d406 Merge "Add APIs to get remote device's battery level (1/2)" am: ceaccbfe70 am: 96f98f255b ...

am: 3b22538b46

Change-Id: I0a579a4dfd47161b3d9aaccaae9a9a43fcc3bafd

2017-06-28 08:44:01 +00:00

..

java

Merge "Add APIs to get remote device's battery level (1/2)" am: ceaccbfe70 am: 96f98f255b

2017-06-28 08:44:01 +00:00

jni

Merge "Use NativeAllocationRegistry for ColorFilter" into oc-dr1-dev

2017-06-27 02:04:04 +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 "Add APIs to get remote device's battery level (1/2)" am: ceaccbfe70 am: 96f98f255b

2017-06-28 08:44:01 +00:00

tests

Merge "Blacklist Night display settings for testing" into oc-dr1-dev

2017-06-27 21:59:34 +00:00