| commit | b068f162a4670287aa66d6b193c84ccd01e3417e | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Apr 03 19:43:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 03 19:43:43 2015 +0000 |
| tree | 0635bd152ba5e60f52bd93b3589225ccc504bfbd | |
| parent | 54d583c148fd14034afc751ad70ab772de55eb92 [diff] | |
| parent | 376b23e6fdda35cc6fa61ea9a3c10d109fe2d601 [diff] |
am 376b23e6: am 08963653: Merge "Rename KeymasterException to KeyStoreException." * commit '376b23e6fdda35cc6fa61ea9a3c10d109fe2d601': Rename KeymasterException to KeyStoreException.