Todd Kennedy cab962b8d0 Merge "Allow explicit permission denial" into oc-mr1-dev ...

am: 7fc53a11f8

Change-Id: I4772c35c57a9b8789417d5e04292c206a001d7e4

2017-08-16 17:41:38 +00:00

..

java

Merge "Allow explicit permission denial" into oc-mr1-dev

2017-08-16 17:41:38 +00:00

jni

Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am: 3f378940c2 am: 93d8497094

2017-08-11 20:20:29 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

2017-07-21 15:51:32 +00:00

res

Merge "Add privileged permission for reading the current wallpaper image" into oc-mr1-dev

2017-08-15 23:50:11 +00:00

tests

Merge "Add convenience methods to IpPrefix and LinkAddress" am: 2ad60c88f1 am: ea2defe62b am: 4d7787a310

2017-08-16 15:20:59 +00:00