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