Jeff Sharkey b2a9f55488 Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev ...

am: c2e09129e0

Change-Id: I26089a2aef16845f2e2935e95810457e287bd0e1

2017-08-12 03:25:49 +00:00

..

java

Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev

2017-08-12 03:25:49 +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 "Change SystemApi as per API council feedback" into oc-mr1-dev

2017-08-11 18:06:46 +00:00

tests

Merge "Implement region guessing." into oc-mr1-dev

2017-08-12 00:16:01 +00:00