diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-14 23:02:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-14 23:02:40 +0000 |
| commit | d4d710888556b6ad8c9120031fc78ca03fc53f0b (patch) | |
| tree | 0b84079a452bb4b5fcdc9269268ef9980a858fe9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5b94267c375877ee7e085231d46995b3f313d671 (diff) | |
| parent | 3b43270cb8e0eb4fd20da57ae88d68a926546946 (diff) | |
[automerger skipped] Merge "Add KeyChain.createManageCredentialsIntent" am: acc78ee8eb am: 424cd636e2 am: 3b43270cb8 -s ours
am skip reason: Change-Id I1e57ed9c18a1ada463c55dbf17ce30e31aa7bad2 with SHA-1 eff614db00 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588312
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f75cd0d0ef389304cde68a80152135cb979f476
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions