OSDN Git Service

am 1247e48e: Merge "Fix security whole in lock task" into mnc-dev
authorJason Monk <jmonk@google.com>
Fri, 19 Jun 2015 15:40:06 +0000 (15:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Jun 2015 15:40:06 +0000 (15:40 +0000)
* commit '1247e48e0262ea9ac807bbd0e0939dc0450cd6ab':
  Fix security whole in lock task


Trivial merge