OSDN Git Service

Merge "Update semantics of on-body Keystore API." into nyc-dev
authorShawn Willden <swillden@google.com>
Wed, 15 Jun 2016 14:48:52 +0000 (14:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 15 Jun 2016 14:48:54 +0000 (14:48 +0000)

Trivial merge