Chad Brubaker 57a9464831 Merge "Allow permissions to be runtime-only." into oc-dev ...

am: 941e9e2b38

Change-Id: I2b1b3a53e6609cc335b4efa9084e603986f58bbe

2017-04-06 16:54:50 +00:00

..

java

Merge "Allow permissions to be runtime-only." into oc-dev

2017-04-06 16:54:50 +00:00

jni

Merge "Camera: Initial support for vendor tag caches" into oc-dev

2017-04-06 14:02:11 +00:00

proto/android

…

res

Merge "Allow permissions to be runtime-only." into oc-dev

2017-04-06 16:54:50 +00:00

tests

Merge "Collect background stats: scheduled jobs" into oc-dev

2017-04-05 22:23:15 +00:00