| commit | 98be580dbbe49b0ce8742fad119ba79411802da5 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Thu Mar 19 00:47:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 19 00:47:54 2015 +0000 |
| tree | 2dca166ed22dac3379d410784e9350c110d663ff | |
| parent | d8379b907f0b0b9778f90e0b5e6c1c5736b4b881 [diff] | |
| parent | 615f39f911cdc4201b4e1c63c79ae1819a6645ea [diff] |
am 615f39f9: am 254c58c4: Merge changes Id9a22ad3,I629ab2c4 * commit '615f39f911cdc4201b4e1c63c79ae1819a6645ea': Add KM_TAG_AUTH_TOKEN. Add support for KM_TAG_USER_SECURE_ID.