| commit | 2ae291da2fd0c4f438621410d0ee1e520e562c21 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Fri Feb 20 22:41:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 20 22:41:17 2015 +0000 |
| tree | 55deb549ad557fff7104b4b9f6adecb801a3f9d6 | |
| parent | cc0900cd68ec033a7d45e43feabf50aadeae4f3d [diff] | |
| parent | e732de519d001335310ae4ba32095130850e97a7 [diff] |
am e732de51: am 789e3c25: Merge "Fix incorrect keymaster device usage." * commit 'e732de519d001335310ae4ba32095130850e97a7': Fix incorrect keymaster device usage.