Yimin Li 0a6c971f56 resolve Coastguard cherrypick merge conflict for change: 16673546 ...

Change-Id: I33c5a2ff2081deb8b01d05681349213cedf3779a
(cherry picked from commit 632bf8c6b439f3ac1a5070b7c5b9344f998e99ac)
Merged-In:I33c5a2ff2081deb8b01d05681349213cedf3779a

2022-01-19 23:34:46 +00:00

..

recents_ui_overrides

resolve merge conflicts of 8786016e85 to rvc-qpr-dev

2021-04-07 18:01:43 +00:00

res

[DO NOT MERGE] Snapshot strings from ub-branch to platform

2020-09-23 14:51:35 -07:00

robolectric_tests/src/com/android/quickstep

Merging ub-launcher3-rvc-qpr-dev to rvc-qpr-dev

2020-07-30 00:26:39 -07:00

src/com/android

resolve Coastguard cherrypick merge conflict for change: 16673546

2022-01-19 23:34:46 +00:00

tests

Merging from ub-launcher3-rvc-qpr-dev @ build 6770831

2020-08-18 04:59:10 +00:00

AndroidManifest-launcher.xml

DO NOT MERGE Revert "Handle uiMode changes"

2020-10-28 19:18:03 -07:00

AndroidManifest.xml

resolve Coastguard cherrypick merge conflict for change: 16673546

2022-01-19 23:34:46 +00:00