Anthony Hugh 41579ff8fc Merge "Update permission label strings" into cw-e-dev ...

am: b69cab65d1

* commit 'b69cab65d180c3166ac84e47da0aa0c1c27bbc67':
  Update permission label strings

2015-10-28 18:29:06 +00:00

..

assets

…

res

Merge "Update permission label strings" into cw-e-dev

2015-10-28 18:29:06 +00:00

Android.mk

…

AndroidManifest.xml

Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev

2015-10-22 06:18:43 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…