diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-20 22:30:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-20 22:30:43 +0000 |
| commit | 860a25eb5591878c38ba5660276c840d1fb03183 (patch) | |
| tree | 37b0ad679fbc42714642ab3c89839f93f5c0f4d5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5052d08554dff773a15492687a9bd0bc826d51de (diff) | |
| parent | 937165d70a184e975e124ddc3a0d6fff4b3dfc3f (diff) | |
Merge changes from topic "am-c1e717b39d9e4d41b9d0b78a59712587"
* changes:
Merge "Revert "Set parent for WindowProcessController"" into qt-dev am: 55b635de99 am: 26a823ec0b am: 1c63ebf02e
Merge "Revert "Override process config for cold start on secondary screens"" into qt-dev am: 0fea6e25c5 am: ddf451d847 am: d886b43230
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions