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