Commit Graph
100 Commits
Author SHA1 Message Date
The Android Open Source ProjectandAutomerger Merge Worker 324f45fffc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23dcc290b0 -s ours am: 9d100fd34e -s ours am: 8adf9df735 -s ours am: 346cea3ffc -s ours am: 98d759a5a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieea79f6097a268890b22ccf347ddc461b05f3a16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 01:21:45 +00:00
The Android Open Source ProjectandAutomerger Merge Worker f6a78cb327 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours am: 1f0d0d73e0 -s ours am: ea013dc451 -s ours am: 0ba34e1a92 -s ours am: c6652a8a81 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I057a871b3cdc522051b646d8e3075e8f9505110b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 01:21:30 +00:00
The Android Open Source ProjectandAutomerger Merge Worker ac6858d888 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23dcc290b0 -s ours am: 9d100fd34e -s ours am: bba6a24d7f -s ours am: bee60ea3b9 -s ours am: db1cba0df2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f611f0524ecea4b10d803b1644344e1f7bb8131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 01:12:13 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 3c3f5a7bda [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours am: 1f0d0d73e0 -s ours am: e436540652 -s ours am: 72a238bb4e -s ours am: dd5375edb2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie1b67d8f159da63121ef96a14f91ee4812b9b3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 01:11:59 +00:00
The Android Open Source ProjectandAutomerger Merge Worker de1c704fdf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23dcc290b0 -s ours am: 9d100fd34e -s ours am: bba6a24d7f -s ours am: b90eff94bb -s ours am: b41b206c14 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If896d2d390d3a1b8aa0d79bdbc951b851087d070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:16:45 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 02246ed947 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours am: 1f0d0d73e0 -s ours am: e436540652 -s ours am: 09f63e1260 -s ours am: 1f77ff7d56 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia2c8f2a84ade956fdf71acf9281f019936b06d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:16:30 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 98d759a5a0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23dcc290b0 -s ours am: 9d100fd34e -s ours am: 8adf9df735 -s ours am: 346cea3ffc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99087273c788b3357c87cf274e1021162b46dfd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:03:30 +00:00
The Android Open Source ProjectandAutomerger Merge Worker c6652a8a81 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours am: 1f0d0d73e0 -s ours am: ea013dc451 -s ours am: 0ba34e1a92 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ee9ea8a594ac95c449b4eb2ffb9819bb5244326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:03:15 +00:00
The Android Open Source ProjectandAutomerger Merge Worker db1cba0df2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23dcc290b0 -s ours am: 9d100fd34e -s ours am: bba6a24d7f -s ours am: bee60ea3b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e5e5683047f2162c75c0851406ac485d2d27c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:47:21 +00:00
The Android Open Source ProjectandAutomerger Merge Worker dd5375edb2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours am: 1f0d0d73e0 -s ours am: e436540652 -s ours am: 72a238bb4e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifebd9cdce53a23f983c384b5d6eb53560cbc23b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:47:06 +00:00
The Android Open Source ProjectandAutomerger Merge Worker b41b206c14 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23dcc290b0 -s ours am: 9d100fd34e -s ours am: bba6a24d7f -s ours am: b90eff94bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54c6161be3406e6f98416bcdd0b9abda0070e78d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:40:17 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 1f77ff7d56 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours am: 1f0d0d73e0 -s ours am: e436540652 -s ours am: 09f63e1260 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I32ba2fa30f2abe084e857709a8f49f9ad276c5bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:40:01 +00:00
The Android Open Source ProjectandAutomerger Merge Worker eab892aa77 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23dcc290b0 -s ours am: 9d100fd34e -s ours am: 1fabf78ac0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc3f09088dd1fdc73dc7ac0f2bb7c49b8898cc89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:53:24 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 5c782ac3db [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours am: 1f0d0d73e0 -s ours am: f594b7db36 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id143926ff1e06b189f348300b3e4ee56a34fe646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:53:08 +00:00
The Android Open Source ProjectandAutomerger Merge Worker b90eff94bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23dcc290b0 -s ours am: 9d100fd34e -s ours am: bba6a24d7f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08da6a11ee2625c3c08a21e8ea712a7e0af77c96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:52:04 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 09f63e1260 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours am: 1f0d0d73e0 -s ours am: e436540652 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5692468833028496d18a158580cd8683b8e2cbf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:51:48 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 346cea3ffc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23dcc290b0 -s ours am: 9d100fd34e -s ours am: 8adf9df735 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91bfbaaba08631e203fd9f0bc66d85cc3926f74d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:49:41 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 0ba34e1a92 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours am: 1f0d0d73e0 -s ours am: ea013dc451 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie01e9f99128b1e57adde711d12a18a5eb11d2563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:49:24 +00:00
The Android Open Source ProjectandAutomerger Merge Worker bee60ea3b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23dcc290b0 -s ours am: 9d100fd34e -s ours am: bba6a24d7f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3c0cc4fc6cc74ed55227248d7b6cb5b365fbb5f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:47:44 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 72a238bb4e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours am: 1f0d0d73e0 -s ours am: e436540652 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e81c14c3a2f24c8d24c2b016e6a869a50297e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:47:28 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 8adf9df735 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23dcc290b0 -s ours am: 9d100fd34e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5bcf0bbecf1226e05cfe2811644b38bc35052449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:37:36 +00:00
The Android Open Source ProjectandAutomerger Merge Worker ea013dc451 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours am: 1f0d0d73e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieec795d632c07f949b2e1e7421bd5a75a4d0604d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:37:19 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 1fabf78ac0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23dcc290b0 -s ours am: 9d100fd34e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic4df56e8079b3a59a69a42cba814028afe7ad8d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:33:15 +00:00
The Android Open Source ProjectandAutomerger Merge Worker f594b7db36 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours am: 1f0d0d73e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f6a6295fc16ced9690b85be781877d35af02ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:33:00 +00:00
The Android Open Source ProjectandAutomerger Merge Worker bba6a24d7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23dcc290b0 -s ours am: 9d100fd34e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic71bca2f54d714bb1205d2f76c1e8c5f9e31319e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:26:06 +00:00
The Android Open Source ProjectandAutomerger Merge Worker e436540652 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours am: 1f0d0d73e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a852f1d0426f18cf027051c7c9e45efeb32af02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:25:51 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 9d100fd34e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23dcc290b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2cedf8d52cc1ebfe99d4bbcd5a2e426d26994a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:16:57 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 1f0d0d73e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67e6bbb6f401a980853fc436cd78115f000d7be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:16:41 +00:00
The Android Open Source Project ca5c8498e3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id78a8dde0dc86868819a3157a97929b01a5fbd2f
2022-05-08 10:49:36 +00:00
The Android Open Source Project 38a49a9efc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5b07a01ef370d1b51fac9e48feb6c2d4aa99a88f
2022-05-08 10:47:37 +00:00
The Android Open Source Project 23dcc290b0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibaec1f87cbd2eb8bb704317d7dcfe125dfeb515d
2022-05-08 10:47:03 +00:00
The Android Open Source Project 92b1c3965e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6320b11af2d33a1040a16afd1cf9dfb145ca0f41
2022-05-08 10:46:03 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 8ea9e0d6e1 [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: ec304d206e -s ours am: 368b18ee65 -s ours am: f000fc2fce -s ours am: c64829ff64 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia533168e11e21c5dbf8a13f34a72353eb2bdc070
2021-11-03 00:47:31 +00:00
The Android Open Source ProjectandAutomerger Merge Worker c64829ff64 [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: ec304d206e -s ours am: 368b18ee65 -s ours am: f000fc2fce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I339bd59d2b536137297fb614855d7a6b160bbda2
2021-11-03 00:30:56 +00:00
The Android Open Source ProjectandAutomerger Merge Worker f000fc2fce [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: ec304d206e -s ours am: 368b18ee65 -s ours
am skip reason: Merged-In I92ba4bd46f2671c0bc33a71631ce1b0290198c67 with SHA-1 befc4950d8 is already in history

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

Change-Id: Idbc5d058fa082b3f6c90cd3e31d33b16e9df0814
2021-11-03 00:12:30 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 368b18ee65 [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: ec304d206e -s ours
am skip reason: Merged-In I92ba4bd46f2671c0bc33a71631ce1b0290198c67 with SHA-1 befc4950d8 is already in history

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

Change-Id: Ia3c560c6e66d9b70df741a1ef5818aadbc5f3fa2
2021-11-02 23:55:42 +00:00
The Android Open Source Project ec304d206e Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE
Merged-In: I92ba4bd46f2671c0bc33a71631ce1b0290198c67
Change-Id: I9f61cd1e3a3feebf6fc2aaa020e65a8909662712
2021-11-02 14:11:57 -07:00
The Android Open Source ProjectandAutomerger Merge Worker 4064b6b92e [automerger skipped] DO NOT MERGE - Merge RP1A.201005.006 am: 05a4c9e19a am: 603572dd6c am: 6b3d5d51b6 am: 1d05532628 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iafff39d1168805172d83401feaa4e6f43d9209d2
2020-10-06 22:17:51 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 1d05532628 DO NOT MERGE - Merge RP1A.201005.006 am: 05a4c9e19a am: 603572dd6c am: 6b3d5d51b6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1449166

Change-Id: I0fe784c14863ff69c8375883331a04937cb2f6d4
2020-10-06 21:49:13 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 6b3d5d51b6 DO NOT MERGE - Merge RP1A.201005.006 am: 05a4c9e19a am: 603572dd6c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1449166

Change-Id: I2eec0c9e683a4c6c33c4a6cc69cd8e7e4a391e6c
2020-10-06 21:15:43 +00:00
The Android Open Source ProjectandAutomerger Merge Worker 603572dd6c DO NOT MERGE - Merge RP1A.201005.006 am: 05a4c9e19a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1449166

Change-Id: I54d4f1ced0cc63b31b1d7a9b859c057f56bd5db2
2020-10-06 20:23:55 +00:00
The Android Open Source ProjectandXin Li 05a4c9e19a DO NOT MERGE - Merge RP1A.201005.006
Bug: 168212094
Merged-In: Idef112187f34a18feea7e6a0b77258626f9d0ed4
Change-Id: Ibab48c1925a0ab7a80ddcaba45a7b73219bb0b0a
2020-10-06 16:53:21 +00:00
The Android Open Source Projectandandroid-build-merger fec6bca08a [automerger skipped] Merge "DO NOT MERGE" am: b7d8cd1e48 -s ours am: e12449eaf9 -s ours
am: 1bc4116265  -s ours

Change-Id: Ieffaab4a16a639ebeeb5f92296fe1f4e3cddc935
2018-12-06 18:45:26 -08:00
The Android Open Source Projectandandroid-build-merger 1bc4116265 [automerger skipped] Merge "DO NOT MERGE" am: b7d8cd1e48 -s ours
am: e12449eaf9  -s ours

Change-Id: I09484937ca3e0832a95e54c74ac516a1bec888fe
2018-12-06 18:23:16 -08:00
The Android Open Source Projectandandroid-build-merger e12449eaf9 [automerger skipped] Merge "DO NOT MERGE"
am: b7d8cd1e48  -s ours

Change-Id: I6777aa1b93e58095b9c10053509a9d7da459e0d9
2018-12-06 17:57:39 -08:00
The Android Open Source Project db61aad1a7 DO NOT MERGE
Merge pie-platform-release (PPRL.181105.017, history only) into master

Bug: 118454372
Change-Id: I0916dec2742f3739f34335c437f38a193723b928
2018-12-06 14:11:38 -08:00
The Android Open Source Project 5a492ea801 Import translations. DO NOT MERGE
Change-Id: Ieb766acaf2da7f21bf8b9fded3313bcc1ab59c31
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-09 04:25:44 -07:00
The Android Open Source Project f4085ff7cc Import translations. DO NOT MERGE
Change-Id: Ia1a6c690e285583fe62a9743d8e283c26d020ba2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-09 04:24:16 -07:00
The Android Open Source Projectandandroid-build-merger cc2bb0de2c Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorval am: 70cbd2cdb9 -s ours
am: ae4c3c82fc  -s ours

Change-Id: Iab6ac47ca35c8305c7a79e22330b3ef9b1a64358
2017-05-02 13:51:49 +00:00
The Android Open Source Projectandandroid-build-merger ae4c3c82fc Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorval
am: 70cbd2cdb9  -s ours

Change-Id: Id6255fb06ae223474ed44a2eb045c0634d292036
2017-05-02 13:49:19 +00:00
The Android Open Source Projectandandroid-build-merger 78c13ce122 Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorval-polish
am: deb0e04164  -s ours

Change-Id: I0da99e157f4bf771f5ff4d89811fa68d95cc8d62
2017-05-02 13:49:19 +00:00
The Android Open Source Project 448bf2e182 Import translations. DO NOT MERGE
Change-Id: I06403631d61d5852455e12297cfbfdf1dc3a455a
Auto-generated-cl: translation import
2017-05-02 03:40:19 -07:00
The Android Open Source Project 2023510fea Import translations. DO NOT MERGE
Change-Id: I7384c07c2925bf394171475f74443649f2f7d853
Auto-generated-cl: translation import
2017-05-02 03:39:04 -07:00
The Android Open Source Project 3fb17b1ca6 Import translations. DO NOT MERGE
Change-Id: I06d773eb648c315dd683fdc353be5a3f34e91f2e
Auto-generated-cl: translation import
2017-05-02 03:36:29 -07:00
The Android Open Source ProjectandAndroid Git Automerger 967af0bff6 am a9253994: am daac9736: am 0c283cc5: am 08c8c0b4: Merge in Android 4.4
* commit 'a9253994510f27ba861a0b51bab59a3ad69a31a4':
2014-10-29 07:01:13 +00:00
The Android Open Source ProjectandAndroid Git Automerger a925399451 am daac9736: am 0c283cc5: am 08c8c0b4: Merge in Android 4.4
* commit 'daac9736e82aa1c14e11841d602338de20669727':
2014-10-23 17:25:26 +00:00
The Android Open Source ProjectandAndroid Git Automerger daac9736e8 am 0c283cc5: am 08c8c0b4: Merge in Android 4.4
* commit '0c283cc5e77b63d9cbd9984857a5cc15250e688d':
2013-11-26 08:38:33 -08:00
The Android Open Source ProjectandAndroid Git Automerger 0c283cc5e7 am 08c8c0b4: Merge in Android 4.4
* commit '08c8c0b407644514983a0eeb8c97435bfeb7ef58':
2013-11-25 16:24:16 -08:00
The Android Open Source Project 08c8c0b407 Merge in Android 4.4 2013-11-24 16:22:39 -08:00
The Android Open Source ProjectandAndroid Git Automerger 03db8767d5 am 08732898: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '087328986922a36bef6f1829790e0840516405a4':
2013-05-29 08:10:32 -07:00
The Android Open Source Project 0873289869 Reconcile with jb-mr2-release - do not merge
Change-Id: Ib54cc659fb7a4fc18df8f98b1c12547d46e23e8e
2013-05-29 08:06:14 -07:00
The Android Open Source ProjectandAndroid Git Automerger a705456a62 am 9be6ae72: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '9be6ae7264fd203f353a37604a50a963e5814143':
2013-05-21 09:02:35 -07:00
The Android Open Source Project 9be6ae7264 Reconcile with jb-mr2-release - do not merge
Change-Id: I0aa0d8aac380b7cf08b0fcefe06005c7903bf21a
2013-05-21 08:59:20 -07:00
The Android Open Source ProjectandAndroid Git Automerger 3736062244 am e29b9ae4: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'e29b9ae47bc21bb582dd6a0fb57796c09d3c8722':
2013-05-17 12:59:38 -07:00
The Android Open Source Project e29b9ae47b Reconcile with jb-mr2-release - do not merge
Change-Id: I777d9066b0b198cfcb65bd17b8206d9d046b8d51
2013-05-17 12:54:48 -07:00
The Android Open Source ProjectandAndroid Git Automerger 040c13b3a5 am 9ad2c67a: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '9ad2c67ab0da915134dc6020f57cce8f7cb30c70':
2013-05-16 05:48:23 -07:00
The Android Open Source Project 9ad2c67ab0 Reconcile with jb-mr2-release - do not merge
Change-Id: Idda6bd6033cfd90ecd4a54ccd3e286940ad12d5a
2013-05-16 05:44:05 -07:00
The Android Open Source ProjectandAndroid Git Automerger 9b55b3696a am e9dd491d: Reconcile with jb-mr2-release - do not merge
* commit 'e9dd491d2295204fa5d4c1ea62e2cc80b80b1a59':
  Fix NPE
2013-04-15 10:53:13 -07:00
The Android Open Source Project e9dd491d22 Reconcile with jb-mr2-release - do not merge
Change-Id: I326745b5eab66b6e7ec49cb0db1b66db6ca884fc
2013-04-15 10:46:23 -07:00
The Android Open Source ProjectandAndroid Git Automerger de272d2a9d am 34716a89: Reconcile with jb-mr2-release - do not merge
* commit '34716a89e247aff6853122472a09762eed4a2fc6':
2013-04-11 07:50:53 -07:00
The Android Open Source Project 34716a89e2 Reconcile with jb-mr2-release - do not merge
Change-Id: I49fd5e4403bfbd598174527115887dd252dcf17a
2013-04-11 07:45:25 -07:00
The Android Open Source ProjectandAndroid Git Automerger f650229a91 am 4b0cebb4: Reconcile with jb-mr2-release - do not merge
* commit '4b0cebb4939aa4431f8d0c607db3a8f3424e2a84':
  Fix bug where folder open animation gets finished early
2013-04-10 10:08:23 -07:00
The Android Open Source Project 4b0cebb493 Reconcile with jb-mr2-release - do not merge
Change-Id: Ic2d8fb42f01f3d9ffeeffd2b0a02bc3ddbad2ed7
2013-04-10 10:05:56 -07:00
The Android Open Source ProjectandAndroid Git Automerger e38ed4577a am 48ff7c75: Reconcile with jb-mr2-release - do not merge
* commit '48ff7c754131a9b3f08f4e83106dfb8f0c1a5743':
  Fix crash in draw listener
2013-04-08 13:40:32 -07:00
The Android Open Source Project 48ff7c7541 Reconcile with jb-mr2-release - do not merge
Change-Id: Ia58e3622b8f48598feeae9a089adb7af125e8013
2013-04-08 13:36:26 -07:00
The Android Open Source ProjectandAndroid Git Automerger 33aa662ddb am f1bfab47: Reconcile with jb-mr2-release - do not merge
* commit 'f1bfab47b89c8fab7811339c02848ee5a10ec335':
2013-04-03 18:05:29 -07:00
The Android Open Source Project f1bfab47b8 Reconcile with jb-mr2-release - do not merge
Change-Id: Icf2700c6f34ca44ac74b72334809e3e5d3f14917
2013-04-03 16:43:39 -07:00
The Android Open Source ProjectandAndroid Git Automerger 0191be1d67 am 526a09b3: Reconcile with jb-mr2-release - do not merge
* commit '526a09b39f2c4d80731bdb8352f00dd022fee3ad':
2013-04-02 11:04:17 -07:00
The Android Open Source Project 526a09b39f Reconcile with jb-mr2-release - do not merge
Change-Id: Ica8969ad3d63f92950481e984bfafc2b978cfda2
2013-04-02 08:39:45 -07:00
The Android Open Source ProjectandAndroid Git Automerger b32cd38d6c am 67436bf1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '67436bf1a195bc7b5ad4e6f3e7fbf5f5d889642e':
2013-03-20 16:46:46 +00:00
The Android Open Source Project 67436bf1a1 Reconcile with jb-mr2-release - do not merge
Change-Id: I826424d8cfe5a04e8cbf0b623863a6476b0bf128
2013-03-20 09:32:50 -07:00
The Android Open Source ProjectandAndroid Git Automerger 4d71c51acd am f8e70f16: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'f8e70f16996388728522dd0663edc82030f599e6':
  Improve All Apps --> Workspace performance
2013-03-12 14:20:49 +00:00
The Android Open Source Project f8e70f1699 Reconcile with jb-mr2-release - do not merge
Change-Id: I5a17c78d674f81b3dce77d54b8023ecc481f4788
2013-03-12 07:15:03 -07:00
The Android Open Source ProjectandAndroid Git Automerger 15c0ba9139 am afa83482: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'afa8348248f9aa7cca59e1c74992fcd7ac6cbd90':
2012-12-03 11:36:46 -08:00
The Android Open Source Project afa8348248 Reconcile with jb-mr1.1-release - do not merge
Change-Id: I0aecbf7623c5ae21fd0866857f89c30c3233f4d3
2012-12-03 11:34:34 -08:00
The Android Open Source ProjectandAndroid Git Automerger 553e157a0f am ee76e181: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'ee76e18125438183d7e7bfa5e2b10172fcf565ec':
2012-11-28 09:49:35 -08:00
The Android Open Source Project ee76e18125 Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ib1209178390b84af2e57494299fa9320050154e3
2012-11-28 09:47:48 -08:00
The Android Open Source ProjectandAndroid Git Automerger 481d9eaba4 am acbdb76a: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'acbdb76a6bf9953e8e80bd59a41f456c27ddfa25':
2012-11-14 12:44:58 -08:00
The Android Open Source Project acbdb76a6b Reconcile with jb-mr1.1-release - do not merge
Change-Id: I2bf1cf80a9166d9d8d574f811a6ea60f498b0f05
2012-11-14 12:41:25 -08:00
The Android Open Source ProjectandAndroid Git Automerger e12b59b3b9 am 7a63def8: (-s ours) am 5ab56553: am f8fbfd9f: Reconcile with jb-mr1-release - do not merge
* commit '7a63def870ef9089c7ee28e839a80a6544830e11':
2012-11-12 07:34:10 -08:00
The Android Open Source ProjectandAndroid Git Automerger 7a63def870 am 5ab56553: am f8fbfd9f: Reconcile with jb-mr1-release - do not merge
* commit '5ab5655343591baa8b315f8f0513112a1798d389':
2012-11-12 07:31:12 -08:00
The Android Open Source ProjectandAndroid Git Automerger 5ab5655343 am f8fbfd9f: Reconcile with jb-mr1-release - do not merge
* commit 'f8fbfd9fcfc311c66c37d3e63e1feb01726e0b4f':
2012-11-12 07:28:32 -08:00
The Android Open Source Project f8fbfd9fcf Reconcile with jb-mr1-release - do not merge
Change-Id: Icf259b354e115d0514bb0d6c33beffddb4bbcf35
2012-11-12 07:26:33 -08:00
The Android Open Source ProjectandAndroid Git Automerger b4fed67e66 am ac022d92: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'ac022d9229eec51acbd04878067eba0c705e427d':
2012-11-06 12:40:11 -08:00
The Android Open Source Project ac022d9229 Reconcile with jb-mr1.1-release - do not merge
Change-Id: I883abd23470b18df68c30b9307393b9b89ed0061
2012-11-06 12:37:54 -08:00
The Android Open Source ProjectandAndroid Git Automerger 0572d72cf7 am 8bebe981: (-s ours) am c6102390: am 209cdc3b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '8bebe981e5a347a6f99d6916f689fcaf9cd29c8f':
2012-11-06 12:34:00 -08:00
The Android Open Source ProjectandAndroid Git Automerger 8bebe981e5 am c6102390: am 209cdc3b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'c6102390c6f2f7228326913e4d2e7598fbdd596a':
2012-11-06 12:29:54 -08:00
The Android Open Source ProjectandAndroid Git Automerger c6102390c6 am 209cdc3b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '209cdc3b7ac92efb6427910916d04fb93083bcfa':
  Cap launcher swipe animations to max duration
  Workaround for generating QSB icon press states. (Bug 7132477)
  Adding more debug code for dup. ItemInfo bug
  Temporary fix for qsb and hotseat clicking issues
2012-11-06 12:23:57 -08:00
The Android Open Source Project 209cdc3b7a Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ia95ceb234c77dafcedb79274226f4bd279c63c79
2012-11-06 12:18:27 -08:00
The Android Open Source ProjectandAndroid Git Automerger 5eb3a72524 am c8a5ea66: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'c8a5ea665182c454d1e4889b8c2727750383e9d6':
2012-11-01 07:54:42 -07:00