OSDN Git Service

am 43250dd3: (-s ours) am a2bf7616: Merge "Add a wm command to dismiss the keyguard...
authorTim Kilbourn <tkilbourn@google.com>
Thu, 27 Aug 2015 08:55:58 +0000 (08:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 08:55:58 +0000 (08:55 +0000)
* commit '43250dd37f1843f1e0a8ff19aaae287a41f3094b':


Trivial merge