OSDN Git Service

am 6e0891fd: am 4e399ae7: am e0f85cb7: Only show face unlock indication if it applies
authorAdrian Roos <roosa@google.com>
Thu, 21 Aug 2014 00:57:17 +0000 (00:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Aug 2014 00:57:17 +0000 (00:57 +0000)
* commit '6e0891fd0d335e2f2feb376ce6fb5e93d5bf7608':
  Only show face unlock indication if it applies


Trivial merge