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