OSDN Git Service

am a2f78eaf: (-s ours) am 311a2d95: Merge "[Fingerprint] Update string for enrolling...
authorMaurice Lam <yukl@google.com>
Thu, 27 Aug 2015 11:35:27 +0000 (11:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:35:27 +0000 (11:35 +0000)
commit6f9b92f83bd5f32f8b588698f53de5737a1e08b3
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parent2d5c9de6b54cbc6e63071dbac874cec32e989340
parenta2f78eafca1008555315517c5e1ef7ef0bfb1ca0
am a2f78eaf: (-s ours) am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev

* commit 'a2f78eafca1008555315517c5e1ef7ef0bfb1ca0':