| commit | 6e0969a2586a1e6c36c65a8cb8c5b02622bdfbe2 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue Jun 16 22:04:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 16 22:04:59 2015 +0000 |
| tree | b2f7fefa41166cf10fb54bf4ec5138f9d062500d | |
| parent | 2e0e748f10e12e95ea81d118a425ce8070621201 [diff] | |
| parent | 1f30907edbd5d6b6a558be13228dc47edf8ff4cf [diff] |
am 1f30907e: am faffb34e: am ee0a0c6f: Merge "Harden and clean up KeyProtection." into mnc-dev * commit '1f30907edbd5d6b6a558be13228dc47edf8ff4cf': Harden and clean up KeyProtection.