diff options
| author | Anton Hansson <hansson@google.com> | 2020-05-07 13:53:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-07 13:53:28 +0000 |
| commit | 5f4e6b79981f23a30e8332f55260749e5b5318b3 (patch) | |
| tree | e5befef28d29ecc3c913a3dce5bd5b75591e19a8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7d7c870e1e6f08ba29cfa149cc0b0053c2acfb4f (diff) | |
| parent | 64d6c15305a0df71b4c5e11d4ae16360811a0e90 (diff) | |
Merge "Move conscrypt from the set of non-updatable APIs" into rvc-dev am: 4963e51f97 am: 66636332bc am: 64d6c15305
Change-Id: I70e17a0e0edad2cb4882ba91ce921cc5b5b414f9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions