OSDN Git Service

Merge "keystore: Add documentation for user presence required." into pi-dev
authorAllen Webb <allenwebb@google.com>
Wed, 11 Apr 2018 22:19:28 +0000 (22:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Apr 2018 22:19:28 +0000 (22:19 +0000)

Trivial merge