Fan Zhang 8d62516e89 Merge "Misc fixes for notification" into oc-dev ...

am: e3f322dfc7

Change-Id: I0847813623ad35b38eafc73a69f02d45208e8d32

2017-06-19 14:47:34 +00:00

..

res

Import translations. DO NOT MERGE

2017-04-28 19:46:17 -07:00

src/com/android/settings

Misc fixes for notification

2017-06-16 15:27:51 -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