diff options
author | Bill Yi <byi@google.com> | 2019-09-12 00:44:24 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-12 00:44:24 -0700 |
commit | f986b4e9bb3763cad0e318a82908290814826ff0 (patch) | |
tree | 7bbd19100230f3f6e574e9c1ce66ff334ddf6377 /keystore/java/android/security/Credentials.java | |
parent | dcf78a3814f3b60e60704baf4655eda255f29f91 (diff) | |
parent | cb2277412eeb3385dab6469dfe06ad407e8446d8 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 76a8d1c24f -s ours
am: cb2277412e -s ours
am skip reason: subject contains skip directive
Change-Id: I3ddbabefbd1cf5b49eea797eb6b7d2d96ee6016c
Diffstat (limited to 'keystore/java/android/security/Credentials.java')
0 files changed, 0 insertions, 0 deletions