OSDN Git Service

am 63cccf0e: am a33b68af: (-s ours) am d10026cb: Merge "[Fingerprint] Change message...
authorMaurice Lam <yukl@google.com>
Thu, 27 Aug 2015 20:17:50 +0000 (20:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:17:50 +0000 (20:17 +0000)
commit15662c0c4156c2984599f9e5bc11b8012a6fd39b
tree8c762641adaf526afc25ba999560dbfe888bbd1c
parentfc7c549da34b0b629d82b8c9ef690645954cf0e8
parent63cccf0ee900cef3c8046cbc1002e29977d370d8
am 63cccf0e: am a33b68af: (-s ours) am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev

* commit '63cccf0ee900cef3c8046cbc1002e29977d370d8':