Commit Graph

561091 Commits

Author SHA1 Message Date
Automerger Merge Worker
5bb0f603f9 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 210dc47d2b -s ours" into stage-aosp-master am: da7ac9e54c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a675537840566aea1bfe04d804219627521ee9b
2020-12-06 16:16:02 +00:00
TreeHugger Robot
8caaa711c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c110ac2338 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f8d60bdc2eac29accbc1e93610a7ebb3c8bb254
2020-12-06 16:15:47 +00:00
Treehugger Robot
c0ab918d54 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a3a757c8dc -s ours am: 0bf77bd9c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iebb52096885b1ac32487e1cffe3a316f8da84c87
2020-12-06 16:15:32 +00:00
Treehugger Robot
38957d5fba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 871647a491 -s ours am: 728faae9c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89a8bf2848bab75410474218fb5bbd34f9b1d03f
2020-12-06 16:15:18 +00:00
Treehugger Robot
01a0745efd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: dbd5232609 -s ours am: 7b6d6070bc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ad37cea367eb14bb672610179fb8bf2a515e9ab
2020-12-06 16:15:02 +00:00
Treehugger Robot
c2605fa581 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 13eeaecc9d -s ours am: c11efe23f0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I15a8a69e3b0394ec18cafcd1c21666d12aa0a535
2020-12-06 16:14:38 +00:00
Treehugger Robot
b6bec330c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 77b40ed1c6 -s ours am: 8fd78a83ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa94c23d83065a82df2efbd69078af3fc1a2b599
2020-12-06 16:14:09 +00:00
Automerger Merge Worker
da7ac9e54c Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 210dc47d2b -s ours" into stage-aosp-master 2020-12-06 16:12:04 +00:00
TreeHugger Robot
c110ac2338 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-12-06 16:11:02 +00:00
Treehugger Robot
38b62a1d36 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 210dc47d2b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae372e5484ccdff96f5167f8e5bf3bf4d90cabea
2020-12-06 16:07:41 +00:00
Treehugger Robot
0bf77bd9c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a3a757c8dc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaad525a1d20c429e63e82b0523496357ab79667c
2020-12-06 16:05:41 +00:00
Treehugger Robot
728faae9c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 871647a491 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia4251442532e811105feb509abd8081c9a23ce8a
2020-12-06 16:04:13 +00:00
Treehugger Robot
7b6d6070bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: dbd5232609 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I163e5a116492998f6b86e5d327e4c9c462db947d
2020-12-06 16:01:29 +00:00
Treehugger Robot
c11efe23f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 13eeaecc9d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic382f59842d6f557ebf879a05eff1a38a22ec3e3
2020-12-06 16:00:17 +00:00
Treehugger Robot
8fd78a83ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 77b40ed1c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I126bd1dd97de6b73aab423882ae8e96eded174ea
2020-12-06 15:57:41 +00:00
Treehugger Robot
210dc47d2b Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 15:51:02 +00:00
Treehugger Robot
a3a757c8dc Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 15:49:02 +00:00
Treehugger Robot
871647a491 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 15:43:22 +00:00
Treehugger Robot
dbd5232609 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 15:43:02 +00:00
Treehugger Robot
13eeaecc9d Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 15:42:23 +00:00
Treehugger Robot
77b40ed1c6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 15:41:02 +00:00
Bill Yi
633d533c85 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I53a9386c34212f2214fdd7eb88ad423e4ca8a822
2020-12-06 04:27:33 -08:00
Bill Yi
7564ac9035 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I25c9b0281b73330244b9e8c33ad115c43ea9b4ce
2020-12-06 09:58:57 +00:00
Bill Yi
b636bba06b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib0d95e6322e5f2cfbd63cabb37f45e2ee518d9de
2020-12-06 08:15:31 +00:00
TreeHugger Robot
44e090521d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c50e295c82 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3e840e9f1c33617d4eaff58e74993dfa40829761
2020-12-06 03:22:53 +00:00
TreeHugger Robot
c50e295c82 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-12-06 03:06:56 +00:00
Treehugger Robot
725037d02a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6fb53d53d4 -s ours am: 9d42ce687c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3f3b928d3069cfbd1daea1d89bb7309bdb59562
2020-12-06 00:58:01 +00:00
Bill Yi
c88cfa43c9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic063f3e903383708e3a80baa775902918b745729
2020-12-06 00:39:31 +00:00
Treehugger Robot
9d42ce687c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6fb53d53d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id167ad5004d62cc86dc0c729d4adfedc6c150022
2020-12-06 00:06:12 +00:00
Treehugger Robot
1d50e2b3c9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1b11e4ca9c -s ours am: 2575bdbf1b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c49989e0de3eca5996cf7cecdb65f77795443d5
2020-12-06 00:00:05 +00:00
Bill Yi
61c6acc04e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I779ea73cb849f2a4c8ab0d4b38ead13c02ea3242
2020-12-05 23:52:30 +00:00
Treehugger Robot
6fb53d53d4 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-05 23:52:02 +00:00
Treehugger Robot
2575bdbf1b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1b11e4ca9c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb06427e08b09643b7f5ac8f4052bc4ba90eecce
2020-12-05 23:40:51 +00:00
Bill Yi
506e8d1697 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id2c26adb70f2403ba0dfa3a0065be715825f9446
2020-12-05 23:36:10 +00:00
Bill Yi
175d9ea255 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id8abc8de6ceacef61c2bfcaa782578f58e65c3f9
2020-12-05 23:20:37 +00:00
Treehugger Robot
1b11e4ca9c Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-05 23:14:52 +00:00
Bill Yi
25e43d4abb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iea31a83c92860b10a8f16b6f9733f596412febab
2020-12-05 21:57:51 +00:00
Treehugger Robot
4c6621d4dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8816df37e4 -s ours am: 4b4ae36092 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1112784e8cf6c0f1f4c9a240b6fd97f2d50ca252
2020-12-05 21:22:44 +00:00
Treehugger Robot
640a7ef395 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fdbeaf63ec -s ours am: 9fb7a90dbc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f9050f1461894c0af861a37407f79931cccfbff
2020-12-05 21:22:24 +00:00
Treehugger Robot
4b4ae36092 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8816df37e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4020fb74db51eac03b16af508f1888b47e756d7b
2020-12-05 21:07:30 +00:00
Treehugger Robot
9fb7a90dbc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fdbeaf63ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: If7f4b65be5ab86c90cea222028e6fa23c371a390
2020-12-05 21:06:17 +00:00
Treehugger Robot
8816df37e4 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-05 20:53:10 +00:00
Treehugger Robot
fdbeaf63ec Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-05 20:52:51 +00:00
Bill Yi
e7fef77eab Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I386b5ae57d12aa506287b53b11018a18d955d38a
2020-12-05 12:10:22 -08:00
Bill Yi
befb449270 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I85dca250638c5097249cb226109e4028a3c156d1
2020-12-05 20:02:45 +00:00
Treehugger Robot
756ef7c5e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8136182dcd -s ours am: 468874dd4f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib0fe30436bd37d2785414103aa21268496a529e6
2020-12-05 19:33:29 +00:00
Bill Yi
d90f296dd0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib4c485293281b1588e90ae799afcd1b8d4528c66
2020-12-05 19:29:22 +00:00
Treehugger Robot
468874dd4f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8136182dcd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77a15eb88d9fa51ebfb96366f739f9ec0d2f95c6
2020-12-05 19:11:12 +00:00
Treehugger Robot
8136182dcd Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-05 18:36:50 +00:00
Bill Yi
964d4bfbac Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7f7c641801fcd1e593a578b6dd1a8b7595441b6d
2020-12-05 18:22:39 +00:00