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