diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 10:33:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-22 10:33:15 +0000 |
| commit | 029f8edd2ea96bc52b1c3f709d0e3c01277f0a49 (patch) | |
| tree | e96242d54b61f560a2772c7c2080a8dc0b383ba6 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | f77508ffe63ba8edf4062bfff93074d7fcb62c16 (diff) | |
| parent | 8f9134c4c376e74822f2d25b7a821d7abb5bcf40 (diff) | |
Merge changes from topic "am-cb21d9627e334118b18655797a8d36c3" into rvc-d1-dev-plus-aosp
* changes:
Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549eda am: ff8d81faee
Merge "Close assistant activities on closeSystemDialogs" into rvc-dev am: 9e639bb382 am: 833a388c52
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions