Ian Pedowitz 9ebb128c40 Merge "Revert "Revert "Resource ID fixup.""" into oc-dev ...

am: a11196074b

Change-Id: I1ea7b4a17bf7ba6de43db52e996aff4c56dc3bf0

2017-05-16 04:00:05 +00:00

..

assets

…

res

Merge "Revert "Revert "Resource ID fixup.""" into oc-dev

2017-05-16 04:00:05 +00:00

Android.mk

…

AndroidManifest.xml

Merge "Create a new NETWORK_SETTINGS permission" into oc-dev

2017-05-10 17:35:27 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…