Commit Graph

813632 Commits

Author SHA1 Message Date
Bill Yi
322d4e4f5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 555695fe4d -s ours am: 29123d30db -s ours am: 622c0ebdb9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10f477d72702537ebf5b3555ff8aaa438f424168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 01:45:47 +00:00
Bill Yi
565349f665 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ed55f01d -s ours am: 61970fa89f -s ours am: 1333b64055 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I52a67e7b09ddbdc49d1057287c548982bdad91ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 01:45:22 +00:00
TreeHugger Robot
106145fc27 Merge "Add descriptive toString method and missing accessors" 2022-07-01 01:27:28 +00:00
TreeHugger Robot
0b81e609d6 Merge "Fix FrameworksCoreTest failue due to system font modification" 2022-07-01 01:26:02 +00:00
Bill Yi
622c0ebdb9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 555695fe4d -s ours am: 29123d30db -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6e8e9e086a07288ffdc2361628472192426fd6cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 01:19:26 +00:00
Bill Yi
1333b64055 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ed55f01d -s ours am: 61970fa89f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I287ad98b400f55a0fe3307bc05bbd3399b3e2d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 01:19:09 +00:00
Bill Yi
29123d30db [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 555695fe4d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iafb160e9de703ca6dc6beab78bac82c1b20efedc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:55:20 +00:00
Bill Yi
61970fa89f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ed55f01d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd670dc807dc0b3330b1a37dfde7a5eb8e732525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:54:56 +00:00
Automerger Merge Worker
6febf4946c Merge changes from topic "am-ec9909332fce4d5bbaa869bb48b9491b" into tm-d1-dev-plus-aosp am: 25fb5cd702 am: c41d02b47d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19133927

Change-Id: I46e48bda61b43d6f863ba613181cd5a716d03366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:43:54 +00:00
TreeHugger Robot
3e62e918d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0ca7614ff1 -s ours am: 5072596c59 -s ours am: 81963e17f8 -s ours am: 712fa3d6b8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e54176a04e3a4d95b2c1c39b58db1c8b5621c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:43:15 +00:00
TreeHugger Robot
8eb48e8be1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0ca7614ff1 -s ours am: ddcc583f88 -s ours am: 8420ee3a58 -s ours am: 75325d22bc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib9148b1c66112dcfbd5c568ad3979ac3b043fb6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:41:27 +00:00
Bill Yi
8f67cc0096 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54a172f225 -s ours am: 8921adb65d -s ours am: b096826240 -s ours am: 417a0a146c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia89a465e4c452dfa7b3d963c63803cca194c2f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:40:53 +00:00
Kyunglyul Hyun
fbe5023aab [automerger skipped] Merge "Handle NPE from BluetoothRouteProvider" into tm-d1-dev am: 360af428e8 -s ours am: fc314821e6 -s ours am: 1ae0f7e49a -s ours
am skip reason: Merged-In I931b3eb38704f23b96c80d70d121c27bef297c7b with SHA-1 c376e8c112 is already in history

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

Change-Id: I8e409f051eaf595caaec0d8df628c3ef40e0cd8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:39:49 +00:00
Kyunglyul Hyun
9c2c8ef422 [automerger skipped] Handle NPE from BluetoothRouteProvider am: 50fc93b3b0 -s ours am: d82c4ac137 -s ours am: 5c247cbff6 -s ours
am skip reason: Merged-In I931b3eb38704f23b96c80d70d121c27bef297c7b with SHA-1 c376e8c112 is already in history

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

Change-Id: I52f5169fe217f210a0265e17d63cf2e66bbbc2d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:39:32 +00:00
Automerger Merge Worker
c41d02b47d Merge changes from topic "am-ec9909332fce4d5bbaa869bb48b9491b" into tm-d1-dev-plus-aosp am: 25fb5cd702
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19133927

Change-Id: I789b7ae7b8820d2e125cd0dc52e29b763469d0e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:39:24 +00:00
TreeHugger Robot
712fa3d6b8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0ca7614ff1 -s ours am: 5072596c59 -s ours am: 81963e17f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia35d6f2df5bcf742f56d8a93e185f46fbb358e6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:39:01 +00:00
Treehugger Robot
6c731486a1 Merge "Add more owners to appprediction and smartspace services" am: b015109200 am: d5f11c7387 am: ad54b5f97b am: 7f7f6bc2c9 am: 20c004024e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2142732

Change-Id: I64580f2793813a3ab744dd48b98a72da89d3f3f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:39:01 +00:00
TreeHugger Robot
6fc60e2b44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0ca7614ff1 -s ours am: 5072596c59 -s ours am: 77194102ad -s ours am: dd398f58c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4cfea28586c91cd8f36b483f4e36c2cc4a1803d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:38:16 +00:00
Bill Yi
f326819e2d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54a172f225 -s ours am: 7d2382154d -s ours am: 63bafa6b35 -s ours am: 1b25d7c2c1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac4899f510f8f4a53442715e9f390636450e948e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:37:41 +00:00
TreeHugger Robot
75325d22bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0ca7614ff1 -s ours am: ddcc583f88 -s ours am: 8420ee3a58 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3eca6f886e7e43e34cb8e06aaa9c993f1fedd944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:36:34 +00:00
Kyunglyul Hyun
9284c5f6ef [automerger skipped] Merge "Handle NPE from BluetoothRouteProvider" into tm-d1-dev am: 360af428e8 am: 16d0a455ff -s ours am: 2c0e79a30a -s ours
am skip reason: Merged-In I931b3eb38704f23b96c80d70d121c27bef297c7b with SHA-1 c376e8c112 is already in history

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

Change-Id: I0dea3a3fbb0990c48b202948e1b3dab6ca592347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:36:29 +00:00
Bill Yi
417a0a146c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54a172f225 -s ours am: 8921adb65d -s ours am: b096826240 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I69f45f1459088843658216e049a27fc504ba69fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:36:15 +00:00
TreeHugger Robot
f6b9c2ef55 Merge "Inline notif pipeline flag into NotifMediaManager" into tm-qpr-dev am: 2f20aa960e am: 3c231ae963
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19110370

Change-Id: Ie7cd8a59fc1743d270e76bee42d9179daf9f07a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:35:16 +00:00
Kyunglyul Hyun
1ae0f7e49a [automerger skipped] Merge "Handle NPE from BluetoothRouteProvider" into tm-d1-dev am: 360af428e8 -s ours am: fc314821e6 -s ours
am skip reason: Merged-In I931b3eb38704f23b96c80d70d121c27bef297c7b with SHA-1 c376e8c112 is already in history

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

Change-Id: Ic4eff839ed606831336e7c771f5742d53cb118d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:34:25 +00:00
Kyunglyul Hyun
5c247cbff6 [automerger skipped] Handle NPE from BluetoothRouteProvider am: 50fc93b3b0 -s ours am: d82c4ac137 -s ours
am skip reason: Merged-In I931b3eb38704f23b96c80d70d121c27bef297c7b with SHA-1 c376e8c112 is already in history

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

Change-Id: I9489435443dcf560f0ee94f5017c42c25756839c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:34:21 +00:00
Treehugger Robot
20c004024e Merge "Add more owners to appprediction and smartspace services" am: b015109200 am: d5f11c7387 am: ad54b5f97b am: 7f7f6bc2c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2142732

Change-Id: I93e4227c225dcd0c804f2ed478030a8fdac4feff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:34:03 +00:00
TreeHugger Robot
ae2b467e25 Merge "Inline notif pipeline flag into new pipeline code" 2022-07-01 00:31:52 +00:00
TreeHugger Robot
dd398f58c9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0ca7614ff1 -s ours am: 5072596c59 -s ours am: 77194102ad -s ours
am skip reason: subject contains skip directive

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

Change-Id: I75f58d155b585faa0975ab964435aba024e01038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:17:31 +00:00
Bill Yi
1b25d7c2c1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54a172f225 -s ours am: 7d2382154d -s ours am: 63bafa6b35 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5834a94847ca6581021995244c316471b97e02f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:17:12 +00:00
Kyunglyul Hyun
2c0e79a30a [automerger skipped] Merge "Handle NPE from BluetoothRouteProvider" into tm-d1-dev am: 360af428e8 am: 16d0a455ff -s ours
am skip reason: Merged-In I931b3eb38704f23b96c80d70d121c27bef297c7b with SHA-1 c376e8c112 is already in history

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

Change-Id: I0e123758ecd1a879a09f326f42cab8b3c2dd8a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:16:27 +00:00
TreeHugger Robot
3c231ae963 Merge "Inline notif pipeline flag into NotifMediaManager" into tm-qpr-dev am: 2f20aa960e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19110370

Change-Id: I90112345a8dd54b61dbc389bb51874c746969550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:15:32 +00:00
Automerger Merge Worker
25fb5cd702 Merge changes from topic "am-ec9909332fce4d5bbaa869bb48b9491b" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0ca7614ff1 -s ours am: 5072596c59 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54a172f225 -s ours am: 7d2382154d -s ours
2022-07-01 00:11:17 +00:00
TreeHugger Robot
77194102ad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0ca7614ff1 -s ours am: 5072596c59 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10e1d1c05cbb27cd2b61a5218bc0f4b2c9610529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:10:51 +00:00
TreeHugger Robot
81963e17f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0ca7614ff1 -s ours am: 5072596c59 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac49ca4f4c5e5583001b0f4a36095bdefe65b328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:10:38 +00:00
Bill Yi
63bafa6b35 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54a172f225 -s ours am: 7d2382154d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia613941ef7b3b7e956a44f19c5b41c49fea0ca8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:10:37 +00:00
Bill Yi
c448c036a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54a172f225 -s ours am: 7d2382154d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c1f9897d580f7e14606eeccc029feafa150f0bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:10:19 +00:00
TreeHugger Robot
2df7b9e104 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0ca7614ff1 -s ours am: ab441ebbda -s ours
am skip reason: subject contains skip directive

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

Change-Id: I52fb58c3237f90c508630734fbd5fb40944a91d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:10:09 +00:00
Kyunglyul Hyun
16d0a455ff Merge "Handle NPE from BluetoothRouteProvider" into tm-d1-dev am: 360af428e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19035068

Change-Id: Iede51976decb1d3f73aadbc4a43a9f355e0c61bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:09:54 +00:00
TreeHugger Robot
8420ee3a58 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0ca7614ff1 -s ours am: ddcc583f88 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I614873374b424536dc8f1e951185937e897174a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:09:46 +00:00
Bill Yi
28057d7e35 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54a172f225 -s ours am: 7fe1ecaf7a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia61d888f0f890ddd232c249ba4be0dcb5ecd154f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:09:39 +00:00
Bill Yi
b096826240 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54a172f225 -s ours am: 8921adb65d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifc4a0bf04cff1d9f08b4ade1189e4101ed154727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:09:31 +00:00
Kyunglyul Hyun
fc314821e6 [automerger skipped] Merge "Handle NPE from BluetoothRouteProvider" into tm-d1-dev am: 360af428e8 -s ours
am skip reason: Merged-In I931b3eb38704f23b96c80d70d121c27bef297c7b with SHA-1 c376e8c112 is already in history

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

Change-Id: I3b345435fb1f412ff3445537cefbf9914734f287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:09:21 +00:00
Kyunglyul Hyun
d82c4ac137 [automerger skipped] Handle NPE from BluetoothRouteProvider am: 50fc93b3b0 -s ours
am skip reason: Merged-In I931b3eb38704f23b96c80d70d121c27bef297c7b with SHA-1 c376e8c112 is already in history

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

Change-Id: I7a40b7d83c331fa97a54dc8a4a68fbf993da3c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:09:17 +00:00
Automerger Merge Worker
38066270dd Merge "[automerger skipped] Merge "Set min_sdk_version" into tm-mainline-prod am: 7e8c5a0d21 -s ours" 2022-07-01 00:08:58 +00:00
Jooyung Han
72d7533772 [automerger skipped] Merge "Set min_sdk_version" into tm-mainline-prod am: 7e8c5a0d21 -s ours
am skip reason: Merged-In Ie6dc1f59b459ec01605d796a4d81be04bc1d07da with SHA-1 559889f192 is already in history

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

Change-Id: I399a4b50a10415760d0b11d82807bb08bf168e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:08:31 +00:00
Treehugger Robot
7f7f6bc2c9 Merge "Add more owners to appprediction and smartspace services" am: b015109200 am: d5f11c7387 am: ad54b5f97b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2142732

Change-Id: Ifd8acc860e3d393cf19b01e58322f56975826abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:08:17 +00:00
Steve Elliott
c757b6ecbf Merge "Inline notif pipeline flag into BubblesManager" into tm-qpr-dev am: 53044b7a89 am: 3efa4ee4f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19110369

Change-Id: Idb17bd210238b92a397c4e3f3868f9592b833134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:08:12 +00:00
TreeHugger Robot
a5873022aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ed370d98ef -s ours am: 44a9068f53 -s ours am: 4b0581da5d -s ours am: 01489a270c -s ours am: 1dfb07f374 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I391c756e89f5359890a7eb0f4412c32f4a40c495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:06:52 +00:00
Bill Yi
423e68def8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92a9467c0b -s ours am: 38127c2933 -s ours am: f4989bf425 -s ours am: 6dfa2a7694 -s ours am: a85d197443 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia6da44282eafa9f37592950c78306ca1954f4932
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:06:36 +00:00
TreeHugger Robot
647078c07c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6c39c0bb5d -s ours am: 570c72be6f -s ours am: f132f82fb6 -s ours am: 754256e2a6 -s ours am: 907e2d1487 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4bd4c50c571a5d80ad2bf0c3cbaa7cd767a04f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 00:06:04 +00:00