| commit | d3107ce40fe4bcabf6d65ad26659b938da610905 | [log] [tgz] |
|---|---|---|
| author | Maurice Lam <yukl@google.com> | Wed Jul 15 22:55:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:55:47 2015 +0000 |
| tree | 4d9ac7761c68b2cff506d392bae8ab71f5dc7d48 | |
| parent | 64570b2b70afecad5936f6a39c09023ff6c1a625 [diff] | |
| parent | dfe3368bf67e5bee41fe92a9cca0879007199bcb [diff] |
am dfe3368b: am 649215a5: am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev * commit 'dfe3368bf67e5bee41fe92a9cca0879007199bcb': [Fingerprint] Export FingerprintEnrollIntroduction