Xin Li 0599c79cf7 Merge commit '937ede14d84c2093f831ff8adab96dca207ad742' from ...

oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master

Change-Id: I91ee596e3800726445cfff5dd784bae9dfdad3ee
Merged-In: I91c48c73287a271bd6c99e60e216dead22e68764

2017-11-13 15:18:37 -08:00

..

res

Import translations. DO NOT MERGE

2017-10-20 03:21:50 -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