diff options
author | Kevin Chyn <kchyn@google.com> | 2019-07-03 16:14:33 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-03 16:14:33 -0700 |
commit | 6c848ed8b70ec36ec972942cc50ddc52b7d0436c (patch) | |
tree | 2c8f35fd69862fae302883a9737cfa9513ddad37 /keystore/java/android/security/KeyStore.java | |
parent | 1d76d267d252a225cabc07dbc421e88c4abd901d (diff) | |
parent | e5c0b58738005141380338b559f05611ae774ce0 (diff) |
Merge "Always send userId to FaceService" into qt-r1-dev
am: e5c0b58738
Change-Id: Icaab5dcf538c6c79182951cb0d255bb777bf4a54
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
0 files changed, 0 insertions, 0 deletions