diff options
| author | Anton Hansson <hansson@google.com> | 2020-05-07 13:38:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-07 13:38:11 +0000 |
| commit | 3b70a09be50b7682d0fa01cc8d835ceece9dbf20 (patch) | |
| tree | e5befef28d29ecc3c913a3dce5bd5b75591e19a8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 310a4793824d43f95a58400e95255c141d502e37 (diff) | |
| parent | 297ac9934478645fb8d241722a68652299fe50aa (diff) | |
Merge "Move conscrypt from the set of non-updatable APIs" into rvc-dev am: 4963e51f97 am: 297ac99344
Change-Id: I8df823e118c80b0f872f1229dd17fd6feb9d88d0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions