Christopher Tate 2402e4b385 Merge "Add privileged permission for reading the current wallpaper image" into oc-mr1-dev ...

am: 4b7b5a6c59

Change-Id: I6d8bb5b15b7c9b13edbb6d8b4e3a69af1d9ca17f

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

..

java

Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev

2017-08-15 22:49:15 +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 "Write currentDuration into Parcel" into oc-mr1-dev

2017-08-14 22:28:26 +00:00