Maurice Lam 97f35625b7 Merge "Revert choose lock header file to non-setup theme" into oc-dev am: 1ecbb7d16d ...

am: 40c22ec75a

Change-Id: I6d2d29f3166ff88a38c92b1eb3fa00c7c2abe61c

2017-03-29 16:53:56 +00:00

..

res

…

src/com/android/settings

Merge "Revert choose lock header file to non-setup theme" into oc-dev am: 1ecbb7d16d

2017-03-29 16:53:56 +00:00

Android.mk

…

AndroidManifest.xml

…