| commit | 7d0c22e21b00b339204f0004f5075f088b19cbaa | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Tue Feb 24 04:54:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 24 04:54:34 2015 +0000 |
| tree | c3671eab536d17b0485e0b296e0f063821d3b81f | |
| parent | a13ca400d17750321ac66f6362d7467a3f21d845 [diff] | |
| parent | 3576ca1f9bd1e46101ad940cc5923ac9965cfafe [diff] |
am 3576ca1f: am 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API" * commit '3576ca1f9bd1e46101ad940cc5923ac9965cfafe': Add Keymaster 0.4 binder API