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

..

assets

…

res

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

2017-07-28 23:09:15 +00:00

Android.mk

…

AndroidManifest.xml

Migrate plans to @SystemApi, evolve permissions.

2017-07-28 16:59:14 -06:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…