OSDN Git Service

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

Change-Id: Ic9a083b5f7c458c2aa7e218168c461da7fc154d0