diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-20 15:10:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-20 15:10:15 +0000 |
| commit | d005f9de3651ae2bee0ee915c4b79332b0714900 (patch) | |
| tree | a2150245af9613984f190576b335945fb1898671 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 36e43b436f404981d1ee671cab7297d692de1aa5 (diff) | |
| parent | 1dac4cfc88dae60d071e372611ad62448ac211d6 (diff) | |
Merge changes from topic "am-131d237c29984c7bb98c0b61ca378525" into qt-r1-dev-plus-aosp
* changes:
Merge "Revert "Set parent for WindowProcessController"" into qt-dev am: 55b635de99 am: edeb20cc75
Merge "Revert "Override process config for cold start on secondary screens"" into qt-dev am: 0fea6e25c5 am: f06a8d8141
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions