| commit | b3bb39218888c573c1b341d3ee11516b9ad2d3b4 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Thu Jan 28 23:28:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 28 23:28:06 2016 +0000 |
| tree | dfc5c124eb6886cb95dbff3679f5cba2d9da9e47 | |
| parent | 89c52f16ecea4ebf08d6b3c863e0848438bac23d [diff] | |
| parent | e30ca16ae0e41375201de9132866f5680a5d7baa [diff] |
Merge changes from topic \'km_tag_allow_on_body\' am: a1433ee2f8 am: e30ca16ae0 * commit 'e30ca16ae0e41375201de9132866f5680a5d7baa': Add KM_TAG_ALLOW_WHILE_ON_BODY Add attestation support to keystore.