OSDN Git Service

am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev
authorCraig Mautner <cmautner@google.com>
Tue, 1 Apr 2014 21:41:15 +0000 (21:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Apr 2014 21:41:15 +0000 (21:41 +0000)
commitc70f15fe298655de02c2e72023fafe6fc33d2a55
tree60670f671da18299399851b0ea0b74efef4d2589
parentc7f403f46d824c17f9bd1fb6447425eacc2cccfe
parent2fc798a2270cda98366776af489d45c1043e831d
am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev

* commit '2fc798a2270cda98366776af489d45c1043e831d':
  Fix FLAG_DISMISS_KEYGUARD not working