| commit | 0d03a496110f58f28a85e4d1e5e8640fcc589c61 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Mon Mar 09 22:00:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 09 22:00:44 2015 +0000 |
| tree | 6aadf6f2a5515a17c1b7e8103f95ade4185c9cfc | |
| parent | 41ceb7dbdc66739488f78655af958ba13278fc70 [diff] | |
| parent | bb196a1bdb1f7f06e8a77c8285dec49ef49eeae8 [diff] |
am bb196a1b: am 1b0fbce9: Merge "Use keymaster 1.0 softkeymaster" * commit 'bb196a1bdb1f7f06e8a77c8285dec49ef49eeae8': Use keymaster 1.0 softkeymaster