| commit | 649215a50c65b512b51cd21b54e479cd4ff3b926 | [log] [tgz] |
|---|---|---|
| author | Maurice Lam <yukl@google.com> | Wed Jul 15 22:32:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:32:43 2015 +0000 |
| tree | f71ccbd1c752530974606f345f682da6979a7cef | |
| parent | eb37daffa1291056d4ff99e94ea96e05a1e8f7b1 [diff] | |
| parent | e63322f640cf955ba296e064b07e4920d334f851 [diff] |
am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev * commit 'e63322f640cf955ba296e064b07e4920d334f851': [Fingerprint] Export FingerprintEnrollIntroduction