| commit | 8d33804b01d4fc871b7eed750fa6aad00861f984 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Apr 10 04:34:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 10 04:34:13 2015 +0000 |
| tree | 0e18f03f069dbbee15b2071b0bd128923dde4afd | |
| parent | 2c5eaa0157f20b591b4c5f998d81021719b2e261 [diff] | |
| parent | 037dfb9423a0988398b67520546dae5673aa54bb [diff] |
am 037dfb94: am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes." * commit '037dfb9423a0988398b67520546dae5673aa54bb': Track recent keymaster_defs.h changes.