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