| commit | f22b67323724fc5cd96f549817547b2936dfc7d6 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Apr 30 18:24:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 30 18:24:31 2015 +0000 |
| tree | bbe51923dd3b94d5a482b154ec08573ecc415fc8 | |
| parent | 6dee203aee673eea91633d8557a4aa1ff21296cb [diff] | |
| parent | 4223ce7dc8b1f0544a7d273831b674b6be1e5c4f [diff] |
am 4223ce7d: Merge "Track Keymaster changes." into mnc-dev * commit '4223ce7dc8b1f0544a7d273831b674b6be1e5c4f': Track Keymaster changes.