Fan Zhang e809b806f9 Merge "Misc fixes for settings" into oc-mr1-dev ...

am: 54d816fd90

Change-Id: I7a015ea3ddd7b7cdd9db6896e6459ce3f491dabc

2017-08-09 18:03:29 +00:00

..

res

Import translations. DO NOT MERGE

2017-08-05 19:27:58 -07:00

src/com/android/settings

Misc fixes for settings

2017-08-08 10:34:03 -07:00

Android.mk

Fix phishing attack in ChooseLockGeneric

2017-03-07 19:48:35 +00:00

AndroidManifest.xml

Adding app specific screen for "External Sources"

2017-03-07 23:44:51 -08:00