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
..