OSDN Git Service

Merge "Add userId to RecoverableKeyStoreDb"
authorRobert Berry <robertberry@google.com>
Thu, 21 Dec 2017 18:42:37 +0000 (18:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Dec 2017 18:42:37 +0000 (18:42 +0000)

Trivial merge