Commit Graph

758616 Commits

Author SHA1 Message Date
Bill Yi
87bbc3ea07 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: eefe201e3f -s ours am: 2b15324f49 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796196

Change-Id: If827af161b971ea4c5851196bf49c96391ef18bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:48:15 +00:00
Bill Yi
802232e591 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 37ffdb5e6d -s ours am: a374c299b8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17785619

Change-Id: Ia5991685d27b7318fa5715c04af4027c613a4059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:47:49 +00:00
Bill Yi
779e12495a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9117256258 -s ours am: 7c1d9b90fe -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796128

Change-Id: Id5aba295cf4ad373fd0e3c8c99558c84e58b6520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:47:39 +00:00
Bill Yi
e9bd432e87 Merge changes from topic "presubmit-am-0839647a178343ad9ba8d570f17acd7d" into tm-dev am: ef1ecbc2a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796194

Change-Id: I02af53c71e19472e79f83ac74169787d10313b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:47:29 +00:00
Bill Yi
89b239d0ce [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3db0877e2a am: 0fc7287234 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796194

Change-Id: Ieb1e8c307ef04885650a1c37ac8767dffff8ffbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:47:27 +00:00
Bill Yi
f7fcaa11af Merge changes from topic "presubmit-am-1f82416e0ad1476b96c0b2970ccf1a1a" into tm-dev am: c2b48fa049
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796196

Change-Id: I0e2af54e7cae237172adc4291ebab8892c96babb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:47:05 +00:00
Bill Yi
b21b4ef9a6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 919a0820f1 am: 62ca88572e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796196

Change-Id: I7ad8d4aaf315010eeefa4147f56a221203f2fe9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:47:04 +00:00
Bill Yi
e82f249ed9 Merge changes from topic "presubmit-am-d599420170a84c50a10ba549a2b93827" into tm-dev am: 1fe8cad8f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17785619

Change-Id: Id9b49705ab1d45afe5405babec5f21d659dbc69e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:45:53 +00:00
Bill Yi
a5ebb6ac58 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e033135758 am: 748fa013cd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17785619

Change-Id: I26222e8d6c37c213a9a958160ef48bf7cf191862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:45:52 +00:00
TreeHugger Robot
fd19db58de Merge "Reset crop after finished transition" into tm-dev am: 02853a7ae4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17537787

Change-Id: I7d9a5d68215d762b7054359f7be8911efcbf86cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:45:15 +00:00
Bill Yi
eedbc1869f Merge changes from topic "presubmit-am-975126cf03be4f49b83d52ef5710ad8d" into tm-dev am: 694a135e59
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796128

Change-Id: Iacabfc28f71247820e5b2b709b2d40a2e382d122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:44:57 +00:00
Bill Yi
ca5d188cbb [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10719216ba am: c3ba026d05 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796128

Change-Id: I76bbe531c6ac246b073d86823feb437b634c5c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:44:55 +00:00
Bill Yi
b0ed9116bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: edde4bd7ab -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784652

Change-Id: I24d8ba1ac08163adcea2147aa7b3e3b5a2f25c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:44:05 +00:00
Bill Yi
8c17568472 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c73c67de5e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784652

Change-Id: I480ce01268244921c0e923a0782c7b7564a6a333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:44:04 +00:00
Bill Yi
53007fcac1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7cfd0c0f1e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784662

Change-Id: Ib25bfea0d00927ed76495bd468f7352e46d717fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:43:13 +00:00
Bill Yi
d935f83d4b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c0befb304 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784662

Change-Id: I7b9a9248334e7a69d79e46425d1e581f74d9172b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:43:11 +00:00
Bill Yi
09e9fe0074 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c8c7257aa4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784479

Change-Id: Ia7e74cb176d165c9c8ff4b11d2af90bbcb227183
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:42:54 +00:00
Bill Yi
cb5a1999d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 943568b54a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784479

Change-Id: I1c445214826fa0a364e3bd82a144da5f95fbc37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:42:53 +00:00
TreeHugger Robot
503660cb73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 717175a411 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784658

Change-Id: Ic3f9bd76437cd90092210e8cd38145eb087f9aa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:42:38 +00:00
Bill Yi
25afa21725 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bd7eaef677 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784658

Change-Id: Ie184be574551958002b0a50dbdd21f4bc5a7799e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:42:36 +00:00
TreeHugger Robot
76b78b91be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 370b176ad6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784654

Change-Id: I1e9c42fc59f4bbda0c01087e5a6e94e71097995a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:41:23 +00:00
Bill Yi
4f52934b13 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d9b961a06 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784654

Change-Id: I1716b261d44b7d446082624970c988c54fa1a648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:41:22 +00:00
TreeHugger Robot
d3cc21970f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3b03747d88 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784650

Change-Id: I8951eaf70c82bef01d43ddd4b9d35ac8ee1d77d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:40:30 +00:00
Bill Yi
6f9965dd36 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e43ee18599 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784650

Change-Id: I524f78efcd755a752c179d5eb533c29922e2e38e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:40:29 +00:00
Bill Yi
2b15324f49 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: eefe201e3f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796196

Change-Id: I352a557c33d91540bf473dd429e161f7f3f142df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:39:46 +00:00
Bill Yi
a374c299b8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 37ffdb5e6d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17785619

Change-Id: I07073c8dfd838ea79d87803dd5a3de81d51737c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:39:01 +00:00
TreeHugger Robot
cefc8b822a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c73752cb15 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784656

Change-Id: I40a5005530894617769ca88ea1dce70d73e1d8f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:38:18 +00:00
Bill Yi
77efbf3345 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 697718c98d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17784656

Change-Id: I4a1ea1a99563f21841f2d23cfe1148ca80c6a66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:38:16 +00:00
Bill Yi
7c1d9b90fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9117256258 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17796128

Change-Id: I14f403b09d8be26ca4d22e44e979ac04f8fd0fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:38:08 +00:00
Bill Yi
1c22f08286 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-19 00:26:20 +00:00
Bill Yi
7bddb68ffb Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-19 00:23:55 +00:00
Bill Yi
ef1ecbc2a9 Merge changes from topic "presubmit-am-0839647a178343ad9ba8d570f17acd7d" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3db0877e2a
  Import translations. DO NOT MERGE ANYWHERE
2022-04-19 00:23:23 +00:00
Bill Yi
ac8d9aeb80 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-19 00:23:02 +00:00
Bill Yi
c9524cf848 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-19 00:22:50 +00:00
Bill Yi
c2b48fa049 Merge changes from topic "presubmit-am-1f82416e0ad1476b96c0b2970ccf1a1a" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 919a0820f1
  Import translations. DO NOT MERGE ANYWHERE
2022-04-19 00:21:59 +00:00
Bill Yi
eefe201e3f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-19 00:21:59 +00:00
Bill Yi
1fe8cad8f3 Merge changes from topic "presubmit-am-d599420170a84c50a10ba549a2b93827" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e033135758
  Import translations. DO NOT MERGE ANYWHERE
2022-04-19 00:21:25 +00:00
Bill Yi
37ffdb5e6d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-19 00:21:25 +00:00
TreeHugger Robot
02853a7ae4 Merge "Reset crop after finished transition" into tm-dev 2022-04-19 00:20:42 +00:00
Bill Yi
694a135e59 Merge changes from topic "presubmit-am-975126cf03be4f49b83d52ef5710ad8d" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10719216ba
  Import translations. DO NOT MERGE ANYWHERE
2022-04-19 00:19:32 +00:00
Bill Yi
9117256258 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-19 00:19:32 +00:00
Bill Yi
edde4bd7ab Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-19 00:19:19 +00:00
Bill Yi
7cfd0c0f1e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-19 00:19:12 +00:00
Bill Yi
c8c7257aa4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-19 00:19:06 +00:00
TreeHugger Robot
717175a411 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-19 00:16:50 +00:00
TreeHugger Robot
a06fea3436 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-19 00:16:01 +00:00
TreeHugger Robot
1e46aebf91 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-19 00:15:54 +00:00
TreeHugger Robot
370b176ad6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-19 00:15:25 +00:00
TreeHugger Robot
e2b4eb4832 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-19 00:14:52 +00:00
TreeHugger Robot
3b03747d88 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-19 00:13:45 +00:00