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

am: 2c131cafae

Change-Id: I1f1d834712004b520a02d3116de945c668236f81

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

..

java

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

2017-07-30 00:15:17 +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

…

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