Commits · 9f7cbf63c2904f39678badd6c178afe070f254de · Dhina17 / platform_frameworks_base

Sep 26, 2023
- Snap for 10860171 from f78cd538 to 24Q1-release · 9f7cbf63
  Android Build Coastguard Worker authored 1 year ago
  
  Change-Id: I79834e84cfe07caacdd71d8833879aa449487e23
  9f7cbf63
Sep 25, 2023

Merge changes from topic "am-de0a592072e44aab9fc54bfc3cb36267" into main · f78cd538

Automerger Merge Worker authored 1 year ago

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 537b777e -s ours am: 9fcf4cfc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d162abc6 -s ours am: a5355a32 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 73351e53 -s ours am: 8b067842 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c775fef -s ours am: 197474d3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2d935dc8 -s ours am: 403d6d73 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7df679c -s ours am: ac6d4cf4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ab4c037b -s ours am: 15f2b7aa -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39788775 -s ours am: 95f9830c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fb3a5d68 -s ours am: 0a8ad248 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73c8238c -s ours am: b3818182 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4a0cf158 -s ours am: c97292ab -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f1e0b52 -s ours am: df89a997 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 72a9a858 -s ours am: 48153f39 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17968daf -s ours am: 9ca0f694 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 61317a98 -s ours am: 596c617a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 800081d3 -s ours am: 0d0d4406 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9a6043a2 -s ours am: d0079876 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: da558f1a -s ours am: 2c98f21a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 180b8e47 -s ours am: af018a8f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d8849b3 -s ours am: d8d583e5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a342cdf8 -s ours am: 83ed5406 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ca288ea -s ours am: f0aeece7 -s ours

f78cd538

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · e5548a26

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 537b777e -s ours am: 9fcf4cfc -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ibd3bdb06fef54b3ae148f48cb911493b57a801d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e5548a26

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · 76ab3c2f

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d162abc6 -s ours am: a5355a32 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I0e59a558fd2c3ff7398cb2c2241c2bc396f8f633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

76ab3c2f

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · f9b1889b

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 73351e53 -s ours am: 8b067842 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I6b88607cf2ec3e00d975e44c0f2b9b3acf777070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f9b1889b

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · 08be317b

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c775fef -s ours am: 197474d3 -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ie9c131d438ef176f3f418de7c0ce403e58677433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

08be317b

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 56a08a5a

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2d935dc8 -s ours am: 403d6d73 -s ours

am skip reason: subject contains skip directive

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



Change-Id: Iddbce246310a2ec1f52be200e43decfd48250c39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

56a08a5a

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · b93c0fcd

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7df679c -s ours am: ac6d4cf4 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I994a4bb6627c66de91c491bf22426bcb3aefd0bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b93c0fcd

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 1f7bc15f

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ab4c037b -s ours am: 15f2b7aa -s ours

am skip reason: subject contains skip directive

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



Change-Id: I0a9ececef75877df7a392e13f7d8bb9ddeaecafc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1f7bc15f

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · c00544c4

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39788775 -s ours am: 95f9830c -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ifc4efd189e78c676c751e8cd28717233697e3620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c00544c4

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · cc04c975

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fb3a5d68 -s ours am: 0a8ad248 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I0af55b20809b391baaef92828f7180ee8d743a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cc04c975

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 2fef2e24

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8c3a568b -s ours am: 3f9010c9 -s ours am: 75fb5dbb -s ours

am skip reason: subject contains skip directive

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



Change-Id: I8ddf61e8374aeb1e9d64acc3c764e7a2177fc12b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2fef2e24

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · 4e725094

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92983612 -s ours am: e0a23f23 -s ours am: 8e97d94e -s ours

am skip reason: subject contains skip directive

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



Change-Id: I0e6c4d835eef447cb737d199eff223d238caacf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4e725094

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · c4e1bc39

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73c8238c -s ours am: b3818182 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I792494c6be43d5fb297b244556467fab03373443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c4e1bc39

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 24c6810d

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4a0cf158 -s ours am: c97292ab -s ours

am skip reason: subject contains skip directive

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



Change-Id: I810a32420d7d9515dfedc1d81ba83095d2699f7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

24c6810d

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · bbbb4daa

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: e260daf7 -s ours am: 76521bde -s ours am: 50456705 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I918283e8e12c182e8d1aab3d28b1f124d17a8625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bbbb4daa

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · 9ccf13fb

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f1e0b52 -s ours am: df89a997 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I0f6a90975a48c7d3bca030f9d705959c84b4f4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9ccf13fb

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · ad3d3f9e

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51ee4af5 -s ours am: ed78a733 -s ours am: 8e9158be -s ours

am skip reason: subject contains skip directive

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



Change-Id: I35ca53e824f5e40a3bb1c2a066dff94160a8c208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ad3d3f9e

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · e249dcf3

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 72a9a858 -s ours am: 48153f39 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I16c9a8ad95cbc2cdc4a5eeb8c72ead31d73118f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e249dcf3

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 9e1ba54f

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 870326fd -s ours am: d88fdc4b -s ours am: bbda785a -s ours

am skip reason: subject contains skip directive

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



Change-Id: I278d568bb31f32eac0e8893654cfe908a1a1d0c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9e1ba54f

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · 8b127579

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cfb61a7e -s ours am: 744f50d6 -s ours am: a9ae5833 -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ic9d31a45636df0b5e30685c537cb6ba7d776eaa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8b127579

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · 711b695c

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17968daf -s ours am: 9ca0f694 -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ib05eb3a2e34b7034db25623d3983f32cb4e95ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

711b695c

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · a9139202

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 61317a98 -s ours am: 596c617a -s ours

am skip reason: subject contains skip directive

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



Change-Id: I6a6515a66431a03606e6a3caf0ed0e1be247b880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

a9139202

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 37fbbc78

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 34dd8e55 -s ours am: 3cf7ab3f -s ours am: 59ccd299 -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ie3b988a7c47f0b5aab27a114399f40f79b6f1e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

37fbbc78

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · 6a1ea515

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 800081d3 -s ours am: 0d0d4406 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I173ed4242ca4ec8e965048f1bc74ab5cab5005bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6a1ea515

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · 57c4a4fa

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: beca32d2 -s ours am: f88c031b -s ours am: 1e29f22c -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ib94c263d5db4a6bf21ff15f23747539b38e633d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

57c4a4fa

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · f4d96a1d

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 291f7320 -s ours am: d8425635 -s ours am: 415bc191 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I90df1f3c81be2ee49b3315db37ae643fdaddbc3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f4d96a1d

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · dba2011b

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9a6043a2 -s ours am: d0079876 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I7544c308be99d890b62049229eb0219bca56b8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

dba2011b

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · 1fc5521a

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: da558f1a -s ours am: 2c98f21a -s ours

am skip reason: subject contains skip directive

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



Change-Id: I0d7a2875fb4a2729d7a61509384610a86f2d9149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1fc5521a

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 5821ae15

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 180b8e47 -s ours am: af018a8f -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ibc1b6b7f52017edfe785c825b4012486354fd83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5821ae15

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · 2c85a49c

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 43794e8c -s ours am: 241c265a -s ours am: 7706cdf8 -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ie3ddb88dabdd2e274bb88a5fb8dfd6249c895c1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2c85a49c

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · b2892405

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d8849b3 -s ours am: d8d583e5 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I69543c5d7ed1dc1e872a950cf32abd0d4624a0f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b2892405

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 0112b4e8

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 27f0eb97 -s ours am: 4d2caf5d -s ours am: bafb018a -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ide734e01086c0e1524af381d8c37f4b275d1cc1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

0112b4e8

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · 5f82b743

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70db450d -s ours am: 6a4ad58b -s ours am: 804fb71a -s ours

am skip reason: subject contains skip directive

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



Change-Id: Iebc46d4a3aa2d5107af79d280c7f56e81e4b5d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5f82b743

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 62e018bb

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eaa6881e -s ours am: 1e28a5a6 -s ours am: 1a1214d5 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I6e92007b2292a94b51f00e895c507193cdf5d9d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

62e018bb

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 8e4e236a

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a342cdf8 -s ours am: 83ed5406 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I5a32e9f362fb8b07d21d75013744a07826d6f146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8e4e236a

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · 7b47be50

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96331b1d -s ours am: 5aa5e885 -s ours am: 969a2d8f -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ie642741f056367c8e321b7a1b3ed3da08f316896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7b47be50

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 5e53aaec

Bill Yi authored 1 year ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 98be6741 -s ours am: 3a5772a4 -s ours am: a168812a -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ie1c589c6a9728f20b46cee5461f7cd490a35783a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5e53aaec

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · e84f5124

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ca288ea -s ours am: f0aeece7 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I0879b98e4e957cbb1536573383116719d9afd45e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e84f5124

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ... · 18c65eda

Bill Yi authored 1 year ago

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19f7d87b -s ours am: 06eb6e9b -s ours am: c8f09ecb -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ifa00614ae5ffa2679593d01f26b9f4b0982a071f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

18c65eda