OSDN Git Service

am 605396b5: am 0074510a: (-s ours) am 997bcaa7: Merge "[Fingerprint] Advertise wake...
authorMaurice Lam <yukl@google.com>
Thu, 27 Aug 2015 20:20:09 +0000 (20:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:20:09 +0000 (20:20 +0000)
commit348740aeecc3dcb8042b3d8d14d09305f4e1af87
tree8c762641adaf526afc25ba999560dbfe888bbd1c
parent6c6f3e04435769ce73e21d728469af6aace0d881
parent605396b5429ffe6c491cb3649c95e661f02d1f52
am 605396b5: am 0074510a: (-s ours) am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev

* commit '605396b5429ffe6c491cb3649c95e661f02d1f52':