diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-08 07:42:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-08 07:42:28 +0000 |
| commit | 38f60684ba36c87fa8329432381c81a1b1a035a0 (patch) | |
| tree | 393efc91f39011133ef53e726eb11bb20f05b1d4 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 0d878a3e1f99d7765aea75f75d760f13c1a1bea6 (diff) | |
| parent | c71cc8a299641ebb756c29029f6e0e2824ea7703 (diff) | |
Merge changes from topic "am-70560489aa0542c99c9043781a2333f5" into rvc-d1-dev-plus-aosp
* changes:
Merge "[DO NOT MERGE] Clear properties after interaction is ended" into rvc-dev am: cdaa4f3cb0 am: d6744b0a9b
[DO NOT MERGE] Clear properties after interaction is ended am: 1145db5d8e am: 63a3ab4e33
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions