| commit | 037dfb9423a0988398b67520546dae5673aa54bb | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Apr 10 00:35:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 10 00:35:55 2015 +0000 |
| tree | 059a80e8d4414ce6983cb259c85a299cae3ca323 | |
| parent | 04a99c7b4435598e4f9d53fadbe5faca4ad7ebdc [diff] | |
| parent | 5f8c17b9f6d574eca6a24ddb2f7cc98a37f5aaea [diff] |
am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes." * commit '5f8c17b9f6d574eca6a24ddb2f7cc98a37f5aaea': Track recent keymaster_defs.h changes.