OSDN Git Service

Merge \"Update semantics of on-body Keystore API.\" into nyc-dev
authorShawn Willden <swillden@google.com>
Wed, 15 Jun 2016 14:54:43 +0000 (14:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Jun 2016 14:54:43 +0000 (14:54 +0000)
am: c152fc15a9

Change-Id: Icf116ed3d722eede02e743a4559ff684a36a82e0


Trivial merge