Bryce Lee 94795bcaf8 Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev am: 33d4702a12 ...

am: 05865fb40a

Change-Id: Ia5817040ce14ee6dbd995bd83444f34e78bef375

2017-07-31 18:53:39 +00:00

..

java

Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev am: 33d4702a12

2017-07-31 18:53:39 +00:00

jni

Merge "SurfaceTexture.cpp: use proper nativehelper headers" into oc-dev-plus-aosp am: 124acec8ad

2017-07-29 20:14:27 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

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

res

Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev

2017-07-30 00:15:17 +00:00

tests

Merge "Rename ACCESS_FM_RADIO to ACCESS_BROADCAST_RADIO permission." into oc-mr1-dev

2017-07-25 17:18:50 +00:00