| commit | bb196a1bdb1f7f06e8a77c8285dec49ef49eeae8 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Mon Mar 09 21:53:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 09 21:53:55 2015 +0000 |
| tree | 6aadf6f2a5515a17c1b7e8103f95ade4185c9cfc | |
| parent | f1171da9b65d11b0d3f0a7a34bbe5c6485465e20 [diff] | |
| parent | 1b0fbce97776d481ea0ccfee26708d1d26755259 [diff] |
am 1b0fbce9: Merge "Use keymaster 1.0 softkeymaster" * commit '1b0fbce97776d481ea0ccfee26708d1d26755259': Use keymaster 1.0 softkeymaster