| commit | c5f9683c065e6ddf906a354603d19ce57448993f | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Apr 10 18:09:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 10 18:09:27 2015 +0000 |
| tree | dd1b6245fc65d992fd243488931cb2c95ad83404 | |
| parent | a55ec9c2abfd8a8bd216f133ec925e9db1d69ae7 [diff] | |
| parent | a270264c61daa42a5b03bbb1e7f23e77780f8fc0 [diff] |
am a270264c: Merge "Track more changes to keymaster_defs.h" * commit 'a270264c61daa42a5b03bbb1e7f23e77780f8fc0': Track more changes to keymaster_defs.h