diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2021-03-08 15:48:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-08 15:48:29 +0000 |
| commit | a644b688927fd5cd27b5e983a21a15c1356bbd4c (patch) | |
| tree | 1060221746c817755870646d74f90a8e7e952b91 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 060b1b49f95f14b8c387f46b6a318e26255b2528 (diff) | |
| parent | 8c7000ce9572201877218eba934452dc1bac8b60 (diff) | |
Merge changes I425638d3,Ie06232a0 into sc-dev
* changes:
Revert "Migrate ApkAssets to use NativeAllocationRegistry"
Revert "Cast ApkAssets to uintptr_t before jlong"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions