Rubin Xu 55a05e4d35 am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev ...

* commit 'b90a2f9d1a58586ef8215176bae22ac6dc4eaee3':
  String literals for CL ag/586597

2014-11-21 17:54:26 +00:00

..

assets

…

res

am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev

2014-11-21 17:54:26 +00:00

Android.mk

…

AndroidManifest.xml

Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev

2014-11-17 21:02:10 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…