| commit | c1336374bdd6c19cd7ef2ff745092701231eb54e | [log] [tgz] |
|---|---|---|
| author | Maurice Lam <yukl@google.com> | Thu Aug 27 20:21:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:21:31 2015 +0000 |
| tree | 8c762641adaf526afc25ba999560dbfe888bbd1c | |
| parent | 7c3acf520764db8ed652701593b00b5b68800c2e [diff] | |
| parent | 9ee252e8634961981776ca0be26b9c74e56e013f [diff] |
am 9ee252e8: am ef906938: (-s ours) am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev * commit '9ee252e8634961981776ca0be26b9c74e56e013f':