OSDN Git Service

am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev
authorAdrian Roos <roosa@google.com>
Thu, 23 Jul 2015 19:20:22 +0000 (19:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Jul 2015 19:20:22 +0000 (19:20 +0000)
commit9fb98375e80e4b70fe8a5ea2e0cd0e9a6cc6f5c1
treec66b2b35c9fda8fb2b6e28e80e7e4219012fb4d9
parent5c080bd2fb2d99724e1c0cec11fc1fe9d1cad597
parentb30f841cb44e132598939b0797dad41f6c0004a7
am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev

* commit 'b30f841cb44e132598939b0797dad41f6c0004a7':
  Touch, wake and unlock