diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-07 17:32:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-07 17:32:17 +0000 |
| commit | e1997bc7e006d515c0a80cc1ab2fadcf181561a7 (patch) | |
| tree | b0578b48e8b89988dbf59bee1a3107b3d628d6bd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b5c5183a440442d1fc3c323c8bbf8595c41358d4 (diff) | |
| parent | 1505ed8ba3fc427accae6e1858bf09c1de37ecef (diff) | |
Merge changes from topic "am-eedfd1b48b8148d8b87aa8f7e122daed" into rvc-d1-dev-plus-aosp
* changes:
Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea9c am: 95acfb402b
DO NOT MERGE: Keep old callback thread am: 7b6e6089af am: 1f4c5e6b4e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions