OSDN Git Service

am 48ce6d27: (-s ours) am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
authorBart Sears <bsears@google.com>
Thu, 27 Aug 2015 10:22:02 +0000 (10:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:22:02 +0000 (10:22 +0000)
commit878d6edc9a2a8e087768b7feab054cbc98e657f3
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent6abb7a6a9b8cafb0cebd85c6531b12fdfcbd3251
parent48ce6d27015fa40291ed1aa4fcf414c3cb6fa818
am 48ce6d27: (-s ours) am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev

* commit '48ce6d27015fa40291ed1aa4fcf414c3cb6fa818':