Christine Franks a35b696054 Merge "Remove RetailDemoModeServiceInternal" into oc-mr1-dev ...

am: cfb5d97c3f

Change-Id: I614791d2b37573eebfb0a1e5b6da6993267e0f62

2017-07-26 03:35:32 +00:00

..

java

Merge "Remove RetailDemoModeServiceInternal" into oc-mr1-dev

2017-07-26 03:35:32 +00:00

jni

Merge "Update for less arguments in hidl toBinder." into oc-mr1-dev

2017-07-24 21:23:38 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

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

res

Merge "Changing the way the media image scales" into oc-dr1-dev am: e06e3f97fc

2017-07-25 23:32:40 +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