Selim Gurun e8315ab4d7 Merge "Update documentation for Whitelist API" into oc-mr1-dev ...

am: a30ec5ff4c

Change-Id: I28b1d260e9daf408a71494e054dba59954ef926b

2017-07-31 14:35:22 +00:00

..

java

Merge "Update documentation for Whitelist API" into oc-mr1-dev

2017-07-31 14:35:22 +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