Tim Kilbourn 38ae119688 am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev ...

* commit '7cd6aaafda35509607e945fcadc4a556f75ed23b':
  Allow shell to disable keyguard when not secure

2015-09-02 17:48:28 +00:00

..

res

Import translations. DO NOT MERGE

2015-07-15 14:19:57 -07:00

src/com/android/shell

Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.

2015-07-13 14:59:35 -07:00

Android.mk

…

AndroidManifest.xml

Allow shell to disable keyguard when not secure

2015-09-01 14:21:09 -07:00