| commit | 525f5773e3e8980d334ba6846a1de9f2d81267b0 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Jun 06 20:57:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 06 20:57:42 2014 +0000 |
| tree | 0ca7119efb5f127c995f25f949a50aa484297308 | |
| parent | 6e083aeaadd2b78e169b3d696ad937aaf02a8af2 [diff] | |
| parent | a4b882f60c1cf4a5a4535eb7082bea2ca8fabff9 [diff] |
am 31499c15: (-s ours) Merge "Hide the fingerprint API for now. DO NOT MERGE" into lmp-preview-dev * commit '31499c15618c382b4a85bd2f022cf8b645dd86d5': Hide the fingerprint API for now. DO NOT MERGE