Alex Johnston a538ffe2a4 resolve merge conflicts of 8786016e85 to rvc-qpr-dev ...

Bug: 168802517
Change-Id: I84db4b2328ecdd40991f661f23f635f4dd1a42ab
Merged-In: I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd

2021-04-07 18:01:43 +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

[DO NOT MERGE] Add WW log for noti shade swipe down from home.

2020-11-05 08:55:40 +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

DO NOT MERGE Revert "Handle uiMode changes"

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