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