diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-07 17:43:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-07 17:43:09 +0000 |
| commit | b9e295251c27710456eba4a3987d76078160b7d3 (patch) | |
| tree | c19f35f53b336ce546bc0cf48b406986d191e358 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 00da0edb4380ddf0b60b1e1b5197cce6c6880f18 (diff) | |
| parent | 517a30beba403f1a4e00f2188910f0fb36928e6b (diff) | |
Merge changes from topic "am-ee432f9c105e4e2e8edfeb2d532b0939" into rvc-qpr-dev-plus-aosp
* changes:
Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea9c am: 793df6dbee am: a24cc034a5
DO NOT MERGE: Keep old callback thread am: 7b6e6089af am: 0bb84094c4 am: 3e6f27f233
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions