Commit Graph

58436 Commits

Author SHA1 Message Date
Stefan Andonian 3801caf6cc Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev am: 0c809bbe67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18673699

Change-Id: I58f982aff0c82aaae99b1a9acface57dd605340f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 15:52:31 +00:00
Stefan Andonian 0c809bbe67 Merge "Give FloatingIconView a copy of, rather than, the original icon." into tm-dev 2022-06-02 15:33:45 +00:00
Tracy Zhou 768f33f96f Merge "Tune floating rotation button size" into tm-qpr-dev am: 064f3ef103 am: 436fcdc4ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18661670

Change-Id: I3be71128ef1ce18c9d19a8dd070cefed6dcf35dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 08:35:54 +00:00
Tracy Zhou 436fcdc4ff Merge "Tune floating rotation button size" into tm-qpr-dev am: 064f3ef103
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18661670

Change-Id: I430b349515af32159a92b553572680d27cb1995c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 08:02:18 +00:00
Tracy Zhou 064f3ef103 Merge "Tune floating rotation button size" into tm-qpr-dev 2022-06-02 07:59:46 +00:00
Automerger Merge Worker 943292990a Merge changes from topic "am-52a8f1e812834d788cd70facb9ea6640" into tm-qpr-dev-plus-aosp am: 5454c4565c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672017

Change-Id: I4178845e371546191cba9e2a0f1c0b0fdb7028fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:59:00 +00:00
TreeHugger Robot 5fddef4d3c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f23d676049 -s ours am: 99c381b993 -s ours am: 346b96b573 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672017

Change-Id: I73e247cf0178c4c343ef9a1c633e66f45f094fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:58:47 +00:00
TreeHugger Robot 04b597761f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f23d676049 -s ours am: c019433108 -s ours am: 44ed53f7a0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672017

Change-Id: Ic475cdca5559198246276f9e092cea46bf2d453d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:53:31 +00:00
Bill Yi d2bf48a22c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3af8d858e -s ours am: 6c4c2c3b65 -s ours am: dd767d9245 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672017

Change-Id: I1bb50fa8d12f3d1dfe0806fcbbbb97104c59e313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:53:14 +00:00
TreeHugger Robot d246a83e85 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 31656fb4d3 -s ours am: ef435f23b9 -s ours am: 9105ac392e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672010

Change-Id: I63136c05a9921c1da80f5628c38b6ea5995bf3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:52:56 +00:00
Bill Yi 1d61d09847 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b75f873d26 -s ours am: a613fd1466 -s ours am: 27e5b308b9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672010

Change-Id: If76951a9bd06fd150bd9d813af04ea2f5965fedf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:52:41 +00:00
Automerger Merge Worker 5454c4565c Merge changes from topic "am-52a8f1e812834d788cd70facb9ea6640" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f23d676049 -s ours am: 99c381b993 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3af8d858e -s ours am: 819fcee097 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 31656fb4d3 -s ours am: 05bc7ab50c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b75f873d26 -s ours am: 9a3d5e3f1f -s ours
2022-06-02 06:30:25 +00:00
TreeHugger Robot 346b96b573 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f23d676049 -s ours am: 99c381b993 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672017

Change-Id: I4f6609ac3d5da2e9f109148007598ee2d27a4f15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:29:24 +00:00
Bill Yi a158e7b6a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3af8d858e -s ours am: 819fcee097 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672017

Change-Id: Iba68cfb103dcd00fa4cd012f347912af3805e91f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:29:05 +00:00
TreeHugger Robot b379fa8f74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 31656fb4d3 -s ours am: 05bc7ab50c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672010

Change-Id: I461a6845b61030f8a7b1598f82051e0aaa5da80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:28:48 +00:00
TreeHugger Robot 44ed53f7a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f23d676049 -s ours am: c019433108 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672017

Change-Id: I745773d6ffcac74539ea24721bb1211335540b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:28:41 +00:00
Bill Yi 28177debe0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b75f873d26 -s ours am: 9a3d5e3f1f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672010

Change-Id: Idb587877ebe7e799426212be4a7e44f3faa2aba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:28:33 +00:00
Bill Yi dd767d9245 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3af8d858e -s ours am: 6c4c2c3b65 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672017

Change-Id: I02d196250c083ac706bc9410391dd241fd5cb6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:28:24 +00:00
TreeHugger Robot 9105ac392e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 31656fb4d3 -s ours am: ef435f23b9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672010

Change-Id: I8927692c2d1deafa130e6411140b638c371f6b08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:28:06 +00:00
Bill Yi 27e5b308b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b75f873d26 -s ours am: a613fd1466 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672010

Change-Id: Icceb92e3f8d64045b0f8afbb571e04ef6910a755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:27:51 +00:00
TreeHugger Robot 99c381b993 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f23d676049 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672017

Change-Id: Ibac1867d5932e3137e96df0a4f678cba1499fd6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:07:48 +00:00
TreeHugger Robot c019433108 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f23d676049 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672017

Change-Id: I8d2b5087a6fcca71576720e09ba08361d63a8d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:07:48 +00:00
Bill Yi 819fcee097 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3af8d858e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672017

Change-Id: I574fa112a777f335375fb58d4209f51e021dd415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:07:28 +00:00
Bill Yi 6c4c2c3b65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3af8d858e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672017

Change-Id: I30dd7c97f5d5789d219a0fd2ce5a7c34998a05bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:07:28 +00:00
TreeHugger Robot 05bc7ab50c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 31656fb4d3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672010

Change-Id: I005992eef74f7320d46300c71dc6fb8841014aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:07:12 +00:00
TreeHugger Robot ef435f23b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 31656fb4d3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672010

Change-Id: Ibc58f4c3d3c34c8533cca430d5cba36f0bcc274a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:07:12 +00:00
Bill Yi 9a3d5e3f1f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b75f873d26 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672010

Change-Id: I3aa779e0d265368e2eadaae29d2c637002bbfb16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:06:58 +00:00
Bill Yi a613fd1466 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b75f873d26 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672010

Change-Id: I5a4795510de2090ba8785dddf5e37b6c43642ab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:06:56 +00:00
TreeHugger Robot f23d676049 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-02 05:40:03 +00:00
TreeHugger Robot 31656fb4d3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-02 05:40:03 +00:00
TreeHugger Robot 57e27aa858 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5437b2f038 -s ours am: 3176228a47 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672015

Change-Id: I65acb7f855f18011e86a6ab37404973466dd269b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 05:27:16 +00:00
Bill Yi 6e70ddfa72 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b8026fd1d -s ours am: d1e693d875 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672015

Change-Id: I34ea7e3fa1305b545f854d9253b70f01c4237366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 05:26:57 +00:00
TreeHugger Robot 5c13e661af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ff2b6f3525 -s ours am: 8cda20b3bb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672009

Change-Id: I0c6f079170d235057c211d10b87ec38041573164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 05:26:40 +00:00
Bill Yi 8346c60449 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3fcc90b44d -s ours am: 02778aa9bf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672009

Change-Id: Ic270a3c01ac650b702e1fb2bb97163771c465f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 05:26:26 +00:00
TreeHugger Robot 3176228a47 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5437b2f038 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672015

Change-Id: I0c82e4b78fe9f20a722bf4acde07bcd0e1a87e71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 05:02:54 +00:00
Bill Yi d1e693d875 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b8026fd1d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672015

Change-Id: Iff6752d4ad231438506fddd740b5b2010b253e49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 05:02:35 +00:00
TreeHugger Robot 8cda20b3bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ff2b6f3525 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672009

Change-Id: Ib6ed6b1070000097c383167dddb292a76198609b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 05:02:19 +00:00
Bill Yi 02778aa9bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3fcc90b44d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18672009

Change-Id: I97c340b1667584f4ac4321da0c57f4fc6045b4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 05:02:05 +00:00
TreeHugger Robot 5437b2f038 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-02 04:23:47 +00:00
TreeHugger Robot ff2b6f3525 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-02 04:23:47 +00:00
Jerry Chang 202f45166d Fix Flicker of inner corners in split screen when quick switching to
Update divider bar visibility immediately when quick switching to split
pair

Fix: 234609814
Test: manual check quick switch with split pair
Change-Id: I4fc36302763bc0a7de9caca0ab370e3cedc18076
2022-06-02 03:53:19 +00:00
Bill Yi 89ef72aed9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a9044d1ad -s ours am: 7b4d1d6133 -s ours am: 24ea104408 -s ours am: 5deb545296 -s ours am: 3087db057e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18692397

Change-Id: Ifef1ebeafb60390e73b966823c365f3ce4c4cbe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 01:25:36 +00:00
Android Build Coastguard Worker cca438b364 Snap for 8671920 from 42947ea17f to tm-qpr1-release
Change-Id: I07c232d1a85d71df5c992c4bfc5a61a86ce816ae
2022-06-02 01:25:28 +00:00
Automerger Merge Worker d8796b7da0 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a9044d1ad -s ours am: 7b4d1d6133 -s ours am: 54dd31d7d9 -s ours am: e85624e2db -s ours" into tm-qpr-dev-plus-aosp am: 9080275105 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18692397

Change-Id: I6e1441a4a75157ae5a87550c1b9dbb6567bea173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 01:19:19 +00:00
Bill Yi 12185756ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a9044d1ad -s ours am: 7b4d1d6133 -s ours am: 54dd31d7d9 -s ours am: e85624e2db -s ours am: ee18e18763 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18692397

Change-Id: I624e2b71cf6074379d013c621d98f4cbac0bea70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 01:19:01 +00:00
Bill Yi 589ad98378 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a9044d1ad -s ours am: 7b4d1d6133 -s ours am: 54dd31d7d9 -s ours am: 23a2858f84 -s ours am: 7f99d26616 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18692397

Change-Id: I409c5a1b973e3dacd5f83bd78045db34efd6707c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 01:13:01 +00:00
Bill Yi 3087db057e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a9044d1ad -s ours am: 7b4d1d6133 -s ours am: 24ea104408 -s ours am: 5deb545296 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18692397

Change-Id: Id37ca349e4a0c4484be6a0f2395d76e9de3841d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 00:50:04 +00:00
TreeHugger Robot 32e1285512 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-02 00:49:45 +00:00
TreeHugger Robot fe6bcabac2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-02 00:49:45 +00:00
Automerger Merge Worker 9080275105 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a9044d1ad -s ours am: 7b4d1d6133 -s ours am: 54dd31d7d9 -s ours am: e85624e2db -s ours" into tm-qpr-dev-plus-aosp 2022-06-02 00:48:27 +00:00