OSDN Git Service

am f1f11b5b: am 7cd016e3: am 7dfc3540: am 0f01eb7f: am ae9d437b: Merge "Settings...
authorJohn Spurlock <jspurlock@google.com>
Fri, 19 Sep 2014 07:44:37 +0000 (07:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 07:44:37 +0000 (07:44 +0000)
commitcaea99bc5f721ebf7a1b09d019203c39174df7a7
tree94e4cf1e48dcb9877da5f0718e4793922a0475ac
parent301381b4f760c971a28fe1775fcd8db72df84f6a
parentf1f11b5b25ceed85f74c6d64e91a870bf7a1592c
am f1f11b5b: am 7cd016e3: am 7dfc3540: am 0f01eb7f: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev

* commit 'f1f11b5b25ceed85f74c6d64e91a870bf7a1592c':