commit | 4a488846121677c98f36ac6b7273b4f0d8defc97 | [log] [tgz] |
---|---|---|
author | Shawn Willden <swillden@google.com> | Wed Jun 15 14:54:43 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 15 14:54:43 2016 +0000 |
tree | 38fb878d3278467514591d466df703b2ac26745a | |
parent | ad0eb9d1d6d6a43e08fccf33cdd2ccd1d6809244 [diff] | |
parent | c152fc15a9f6099b7a16c345288f4a45c48fb922 [diff] |
Merge \"Update semantics of on-body Keystore API.\" into nyc-dev am: c152fc15a9 Change-Id: Icf116ed3d722eede02e743a4559ff684a36a82e0