Selim Cinek 439750bdf1 Merge changes I66f2c52b,I95f72c9d into oc-dr1-dev am: 68e459918a ...

am: 908fb57142

Change-Id: Ie95fe2b19ada7db94e0e9147ce6b4f7a4acc5a64

2017-06-28 14:45:16 +00:00

..

java

Merge "Fix ACTION_PROVISIONING_SUCCESSFUL documentation"

2017-06-28 12:00:32 +00:00

jni

Merge "Use NativeAllocationRegistry for ColorFilter" into oc-dr1-dev am: 049543b771

2017-06-27 02:08:00 +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 changes I66f2c52b,I95f72c9d into oc-dr1-dev am: 68e459918a

2017-06-28 14:45:16 +00:00

tests

Merge "Blacklist Night display settings for testing" into oc-dr1-dev am: 4608c69f23

2017-06-27 22:09:27 +00:00