commit | 3576ca1f9bd1e46101ad940cc5923ac9965cfafe | [log] [tgz] |
---|---|---|
author | Chad Brubaker <cbrubaker@google.com> | Mon Feb 23 22:53:01 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 23 22:53:01 2015 +0000 |
tree | 8bc3c2c43ddaa0981c14844d5a200c5de1478268 | |
parent | 01d5286f388303551a2eb8f57e210f6d7a690cb5 [diff] | |
parent | 1629f9543a48e93515395a10c50d0394f8be2774 [diff] |
am 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API" * commit '1629f9543a48e93515395a10c50d0394f8be2774': Add Keymaster 0.4 binder API