Andrew Sapperstein 93adcee630 Merge "Revert "Add search bar to SearchActivity."" into oc-dev ...

am: 37f87b6c64

Change-Id: Icbdb586e3e1a35c004298f50a57812e50ee73eea

2017-06-06 19:00:04 +00:00

..

res

Import translations. DO NOT MERGE

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

src/com/android/settings

Revert "Add search bar to SearchActivity."

2017-06-06 17:29:41 +00: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