diff options
| author | Anton Hansson <hansson@google.com> | 2020-05-07 15:43:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-07 15:43:02 +0000 |
| commit | b9991cd7730d0932e8b710cd73bbd4bc67008b84 (patch) | |
| tree | f864f0a8c08bdeaf7569bb88120f1dff3184ece3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f61e4a2dc5ff2643164c65fc03aae5c73eb45a0b (diff) | |
| parent | 9750d877b4b4b803d1eff218f77ba282d440d481 (diff) | |
[automerger skipped] Merge "Move conscrypt from the set of non-updatable APIs" am: d28224cf8a am: b09d7cfb73 -s ours am: f3eb744d89 -s ours am: 9750d877b4 -s ours
am skip reason: Change-Id Iacfcc3a789cb42a73cc4b4c89a215db0ea09800f with SHA-1 e89d37d6d8 is in history
Change-Id: Ife32e2f132063ed889d5479c1d58e5a9e6786ec8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions