| commit | a909f80ddbe2174e223cf5266156eb2b9c4a0faf | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Tue Mar 10 18:16:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 10 18:16:01 2015 +0000 |
| tree | 4a74325e34cd17b8a02133e9960ed0614f23f387 | |
| parent | efd601baf982e17c09f581d6a462c0de046acd9a [diff] | |
| parent | 0d03a496110f58f28a85e4d1e5e8640fcc589c61 [diff] |
am 0d03a496: am bb196a1b: am 1b0fbce9: Merge "Use keymaster 1.0 softkeymaster" * commit '0d03a496110f58f28a85e4d1e5e8640fcc589c61': Use keymaster 1.0 softkeymaster