OSDN Git Service

am ecadeb86: am 7ea86aa8: (-s ours) am 0c758805: Merge "Fix empty keyguard for once...
authorJorim Jaggi <jjaggi@google.com>
Thu, 27 Aug 2015 16:35:27 +0000 (16:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 16:35:27 +0000 (16:35 +0000)
commitf283d860ff31ce667d40b1cbc17351cf83b7133e
tree4e9052ca12f00de06c77cb3ce93ab1eb160e691b
parent93a5fbbf6b067a6dd29654e449ad0afabfb52a50
parentecadeb864c8c2d37c02aebcbedd0358dd3ac3297
am ecadeb86: am 7ea86aa8: (-s ours) am 0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev

* commit 'ecadeb864c8c2d37c02aebcbedd0358dd3ac3297':