Dianne Hackborn 2b8336f241 Merge "Allow device/profile owners to change app ops modes." into pi-dev am: adaca2146d ...

am: 82a87674ce

Change-Id: Id4a52aaca3d94075ff179141e96fba5c7326d4ee

2018-05-14 14:32:23 -07:00

..

java

Merge "Allow device/profile owners to change app ops modes." into pi-dev am: adaca2146d

2018-05-14 14:32:23 -07:00

jni

Merge "Merge "When suid_dumpable == 2, set dumpable to 0 for apps" am: 659a13121c" into stage-aosp-master am: 690eff4bd0

2018-05-14 11:42:16 -07:00

proto

Merge "Show "in parole?" in dumpsys jobscheduler" into pi-dev

2018-05-08 18:09:56 +00:00

res

Merge "Make HDMI_CEC a vendorPriviliged permission"

2018-05-13 16:50:48 +00:00

tests

Merge "Add helloWorld test for core/tests/HdmiCec"

2018-05-14 20:15:57 +00:00