tree f600be2aae2a0a9d214c6ee3ddfe6abd36e29871
parent e85da2bc2eeabb425c4b1270dbd0e22095aac957
parent 26e8d553e52055955db83061c5799ba4439ebe1b
author Shawn Willden <swillden@google.com> 1466002132 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1466002134 +0000

Merge "Update semantics of on-body Keystore API." into nyc-dev