| commit | c0c7776fe4edc7ffcb14bc0a8115126389158677 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Mon Jan 26 19:10:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 26 19:10:52 2015 +0000 |
| tree | 9242fa5e24a8c0a2efee74bd6f9e0208e1e88c57 | |
| parent | e9e04a931c48ce936bb3d6a4540d22116311f49c [diff] | |
| parent | 9f7834106a5db5805112a34e0c6ebe6f1b7a1718 [diff] |
am 9f783410: resolved conflicts for merge of 7793c383 to lmp-mr1-dev-plus-aosp * commit '9f7834106a5db5805112a34e0c6ebe6f1b7a1718': Move hardware module methods to libsoftkeymanager