diff options
| author | Rubin Xu <rubinxu@google.com> | 2021-02-14 23:58:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-14 23:58:15 +0000 |
| commit | 7bc32e7dc97fa17e03676093ec29e6af6ea879d8 (patch) | |
| tree | 0b84079a452bb4b5fcdc9269268ef9980a858fe9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d4d710888556b6ad8c9120031fc78ca03fc53f0b (diff) | |
| parent | 592a85823e4acda2b863cf2a40e174672ad354a4 (diff) | |
[automerger skipped] Merge "Add DPM.getKeyPairGrants()" am: 944e30cf6c am: aa0847edb5 am: 592a85823e -s ours
am skip reason: Change-Id Ieee1048b145fb8400eccbf32c054afc64b5d90c0 with SHA-1 148e31d70c is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571062
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb3d94ca457a35e01d47f47d092565e4f668b33f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions