Chad Brubaker 7671735fa5 Merge "Allow permissions to be runtime-only." into oc-dev am: 941e9e2b38 ...

am: 57a9464831

Change-Id: Ibf8b8f13ff5a8819671142e77ee238ba08805d40

2017-04-06 19:27:22 +00:00

..

java

Merge "Allow permissions to be runtime-only." into oc-dev am: 941e9e2b38

2017-04-06 19:27:22 +00:00

jni

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

2017-04-06 14:14:39 +00:00

proto/android

CEC: Revisit the behavior of HDMI_SYSTEM_AUDIO_ENABLED

2017-03-13 20:00:58 +09:00

res

Merge "Allow permissions to be runtime-only." into oc-dev am: 941e9e2b38

2017-04-06 19:27:22 +00:00

tests

Clone BackupManagerService and make Trampoline aware of the clone.

2017-04-06 12:28:13 +01:00