diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-07 13:15:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-07 13:15:09 +0000 |
| commit | a39ef0eb98d73111e4a3aa7a897ac6fedd7f14ab (patch) | |
| tree | 9fde36b592409bb03685aa8b1fde3bdabcef9215 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9fc65eb28d3d359d9350f07b7ee513d9bf46e519 (diff) | |
| parent | 97b3c914286a9b4f7dfb24f61a7ad11a8ae6dbc5 (diff) | |
Merge changes from topic "am-d3cc8345e04f4674ac385ccbf2461123" into rvc-d1-dev-plus-aosp
* changes:
Merge changes from topic "abandon-race" into rvc-dev am: 6b58f8ca37 am: 8670782013
Persist destroyed staged sessions until they are cleaned up am: 731bd965fb am: 8d6a58a049
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions