| commit | 5f8c17b9f6d574eca6a24ddb2f7cc98a37f5aaea | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Apr 10 00:22:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 10 00:22:45 2015 +0000 |
| tree | d3430fd25c5d306eab58799e2a6a47cb072eca4a | |
| parent | 82cba6aa3792b7d3b7eddf32c64cbf4a7a47e5a5 [diff] | |
| parent | ba2836e6cf5a00855e470705741d9e4b9b1a9df9 [diff] |
am ba2836e6: Merge "Track recent keymaster_defs.h changes." * commit 'ba2836e6cf5a00855e470705741d9e4b9b1a9df9': Track recent keymaster_defs.h changes.