Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
763,205 Commits 3 Branches 0 Tags
bce9900a23be082485cf697faa22b7cfec34a249
Commit Graph

763205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Aliomer
bce9900a23 Merge "Exclude silent notifications from lockscreen" into tm-dev am: 009c9389ee am: 6987f154fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090439

Change-Id: Ic6c304a004defaeb90e35d7e75099e898d36d62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:46:04 +00:00
Jay Aliomer
6987f154fe Merge "Exclude silent notifications from lockscreen" into tm-dev am: 009c9389ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090439

Change-Id: I756ab9a87575cb673c4b44f155812c2584655d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:29:17 +00:00
Jay Aliomer
009c9389ee Merge "Exclude silent notifications from lockscreen" into tm-dev 2022-05-04 18:19:06 +00:00
Miguel Aranda
6f0495d4f0 Merge "Still more libcore benchmarks migrated to Crystal Ball." am: 2dc0d124a7 am: 5c6e766d4b am: e0f0e690cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2084215

Change-Id: I307ce6945e9e3700eeda0a5353cd44ae1f4175c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:18:54 +00:00
TreeHugger Robot
1d91d05007 Merge "RemoteInputView: Add null check in WindowInsetsAnimation.Callback" into tm-dev am: c9a1ec32a3 am: 1f47d4bb40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17543935

Change-Id: Ia38270937335b030c7591b75d6353054dfd0953d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:18:36 +00:00
TreeHugger Robot
4c86166551 Merge "Groups which had a priority conversation promoted out of them do not show that conversation's avatar." into tm-dev am: 220902fcf8 am: ffd5a54c59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130733

Change-Id: I1014be00dcc36077ef9f1f34e7cbb4531abb43b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:18:28 +00:00
Mady Mellor
7b8694ba66 Merge changes Ieb77b211,Iad01b8f3,Ib9653ed3 into tm-dev am: e8ee9cd8d4 am: 43ce369818 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18011489

Change-Id: I7086f888b14058eb3d26bd19dcfa5e8ce74a7257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:17:52 +00:00
Automerger Merge Worker
847fd21ca2 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 674a6a1474 -s ours" into tm-dev am: 7e170b45c3 -s ours am: 1f9fd33de7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I287266f21630d40cc23a4edfba0b24ca543af0a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:17:44 +00:00
Bill Yi
6a86a0cce0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 674a6a1474 -s ours am: d677c3062a -s ours am: 24ffc40cb0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I462a932040023070dfc295519a1b236f11281c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:17:42 +00:00
TreeHugger Robot
4356dbd5aa Merge "Groups which had a priority conversation promoted out of them do not show that conversation's avatar." into tm-dev am: 220902fcf8 am: c3e479b22e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130733

Change-Id: I012c676287acd744692618aecac5d1728e998268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:17:30 +00:00
Automerger Merge Worker
1a700b9a80 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 674a6a1474 -s ours" into tm-dev am: 7e170b45c3 -s ours am: e1491e855d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife9e82eb9f0652d53056433cd96b301adb48c8d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:16:46 +00:00
Bill Yi
5d14c24674 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 674a6a1474 -s ours am: d677c3062a -s ours am: 1933be96d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69445b31d8dad5a367b133f04c6d832400a01024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:16:44 +00:00
Matt Casey
ddbc0684de Merge "Halve listview update delay" into tm-dev am: 1ffed5d942 am: 317f887755 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144265

Change-Id: I63dcf44fe3ec6866a8cab1d77d8ea6974e48ac3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:16:24 +00:00
Matt Casey
282fdeb0d5 Merge "Halve listview update delay" into tm-dev am: 1ffed5d942 am: 1a84e5a7b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144265

Change-Id: Ib608f0b73b07aac7a8ad35d150e0a9cb586416ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:16:20 +00:00
Bill Yi
297aefbb12 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 7e24f34118 -s ours am: b7ee52aa0c -s ours am: 8b467b3090 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e29485d82a405addab1617f4f321b76302deea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:15:56 +00:00
Bill Yi
50b6fdcccd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f6a60645fd -s ours am: 4f52a00860 -s ours am: 529e409ac6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id05cd8605073336b391f19f06c91d0f26c3a7511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:15:26 +00:00
Bill Yi
8ca9d2adfd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 7e24f34118 -s ours am: b7ee52aa0c -s ours am: 22eb5e3bcb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4749d72860b0f9a56369a881fa3302d3d760c11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:15:12 +00:00
Bill Yi
4aae4c3fed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f6a60645fd -s ours am: 4f52a00860 -s ours am: 6758d146ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5a9ce489745fba97ca21e03117b3e10b69e4deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:14:40 +00:00
Automerger Merge Worker
cec83e2aa9 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 4458ca21d1 -s ours am: 41608ecf87 -s ours am: 1ec09d8dff -s ours" into tm-d1-dev-plus-aosp 2022-05-04 18:14:31 +00:00
Bill Yi
fdbcceeaee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 4458ca21d1 -s ours am: 41608ecf87 -s ours am: 606279ccb9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79d14f4ba2da9e5a377a5c1a022c69cf2a9fbe57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:14:27 +00:00
Bill Yi
faababc23d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 4458ca21d1 -s ours am: 41608ecf87 -s ours am: 1ec09d8dff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ba6dba86a8961c65f996863666ccfca8e05b3e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:14:27 +00:00
Bill Yi
33e4d1c879 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6c6d702352 -s ours am: 3f0f6c9762 -s ours am: 1f70d83eb1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If958c43ded952774412f60fec1cc2165093985bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:13:41 +00:00
Bill Yi
1cb7e02816 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a450acbc3 -s ours am: ec92d27811 -s ours am: b442bbd8af -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50bd45ade9aa64477701f9855fbd9c44fbed33f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:13:33 +00:00
Miguel Aranda
e0f0e690cc Merge "Still more libcore benchmarks migrated to Crystal Ball." am: 2dc0d124a7 am: 5c6e766d4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2084215

Change-Id: I9a842e95c4df15662bce58bf9782006f64b19058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:13:13 +00:00
Bill Yi
1aa462b8da [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6c6d702352 -s ours am: 3f0f6c9762 -s ours am: ceefa118fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8cb421b7fe3e0b5770894a9f76ec6137c827678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:13:01 +00:00
Bill Yi
090f80e8d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a450acbc3 -s ours am: ec92d27811 -s ours am: 3f0dd38242 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15145962294e6a24d8b5f031b634d3fe50fe8a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:12:58 +00:00
TreeHugger Robot
1f47d4bb40 Merge "RemoteInputView: Add null check in WindowInsetsAnimation.Callback" into tm-dev am: c9a1ec32a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17543935

Change-Id: I330210c5241033fd5883627179663821c6c924c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:12:42 +00:00
TreeHugger Robot
c9a1ec32a3 Merge "RemoteInputView: Add null check in WindowInsetsAnimation.Callback" into tm-dev 2022-05-04 18:05:41 +00:00
Mady Mellor
43ce369818 Merge changes Ieb77b211,Iad01b8f3,Ib9653ed3 into tm-dev am: e8ee9cd8d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18011489

Change-Id: Ib1a240a9f0b20b18b72ff58cbf5f1c419e4b5cb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:01:50 +00:00
Automerger Merge Worker
805830f7f6 Merge changes from topic "am-96db44aa4dfa4e4485d74486d8ea6f46" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5a06757d3e -s ours am: 1c70ef845b -s ours am: 28da68acfa -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fab6ce2b1 -s ours am: ed410f2d7f -s ours am: 000ae9c5ca -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e8643d9152 -s ours am: fc66866768 -s ours am: 2777849ee1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b48e51d3c4 -s ours am: cc233c7706 -s ours am: 94f9443382 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 1141306f85 -s ours am: 90f6ca769d -s ours am: 141c898497 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c7f6e95c -s ours am: ee2bee6350 -s ours am: 3b8ae18176 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b179433113 -s ours am: 2e3cdeaba6 -s ours am: d834b8408d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9c3c51727 -s ours am: 5893c50790 -s ours am: 69c385b68e -s ours
 2022-05-04 18:01:06 +00:00
Bill Yi
87614a400f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5a06757d3e -s ours am: 1c70ef845b -s ours am: 28da68acfa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d8293fdd077e5d010b2f592458119298cd1c796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:00:52 +00:00
Bill Yi
73f631ebb4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fab6ce2b1 -s ours am: ed410f2d7f -s ours am: 000ae9c5ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97fed63a2264544f582a068d0a5c9d49ac471bfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:00:50 +00:00
Bill Yi
8a4dfcb3bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e8643d9152 -s ours am: fc66866768 -s ours am: 2777849ee1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb862afaf9594eb128bb189086ad972172ef3957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:00:49 +00:00
Bill Yi
6ff0f6aa6f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b48e51d3c4 -s ours am: cc233c7706 -s ours am: 94f9443382 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic49f3dfa084084dd3b61487546fecc024c38db09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:00:47 +00:00
Bill Yi
b10ae35d5b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 1141306f85 -s ours am: 90f6ca769d -s ours am: 141c898497 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cdefa0fee76e64b53f9f507118823f7a70b438a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:00:43 +00:00
Bill Yi
94f1720ec1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c7f6e95c -s ours am: ee2bee6350 -s ours am: 3b8ae18176 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c02230c74c471673afbf363b9dad7c2233a23c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:00:33 +00:00
Mady Mellor
e8ee9cd8d4 Merge changes Ieb77b211,Iad01b8f3,Ib9653ed3 into tm-dev 
* changes:
  If something is suppressed from the notification list don't bubble it
  Tell NoMan to update the auto-expand flag
  Allow SysUI to update BubbleMetadata#FLAG_AUTO_EXPAND_BUBBLE
 2022-05-04 18:00:21 +00:00
Bill Yi
d4be77cc39 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b179433113 -s ours am: 2e3cdeaba6 -s ours am: d834b8408d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7588f63040ccc6be370de43888926389cfe91536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:00:16 +00:00
Bill Yi
4b2f3225cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5a06757d3e -s ours am: 1c70ef845b -s ours am: 072971c55e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03de26811f8a01c813d5910f5c5f8c8b5eff3e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:00:04 +00:00
Bill Yi
37615755ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fab6ce2b1 -s ours am: ed410f2d7f -s ours am: ec8d06bde9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I468aa1f05e208424e1647c56855187e10803f726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:00:03 +00:00
Bill Yi
9319b05fc9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e8643d9152 -s ours am: fc66866768 -s ours am: be28849028 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d9f5387e05f1bbf00b22bae25f1fc04c6c08bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:00:01 +00:00
Bill Yi
72630e5b71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9c3c51727 -s ours am: 5893c50790 -s ours am: 69c385b68e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85971503048bfb3d848095ca4a9e19a91d57f8b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:00:00 +00:00
Bill Yi
76e42abaed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b48e51d3c4 -s ours am: cc233c7706 -s ours am: 52efe4e114 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I661c6d04e5c43bd257e6a8913be42a9591a44f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:59:59 +00:00
Bill Yi
7d0b805c03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 1141306f85 -s ours am: 90f6ca769d -s ours am: 7cb8348251 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e6e72afbd2aea4ee842445b76b458ceab247dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:59:54 +00:00
TreeHugger Robot
c3e479b22e Merge "Groups which had a priority conversation promoted out of them do not show that conversation's avatar." into tm-dev am: 220902fcf8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130733

Change-Id: I27f4f6b11bc268f325a8e49f7b8c4b8d170d1a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:59:46 +00:00
Bill Yi
8a28f24038 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c7f6e95c -s ours am: ee2bee6350 -s ours am: 0307b454fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7dc47dedfae7a13704eb5ba8ebfa3a85f3092fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:59:45 +00:00
Bill Yi
6150f784c9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b179433113 -s ours am: 2e3cdeaba6 -s ours am: 388165c54f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I665df0ea641e901cea5a3c4f54b7ee024dd7c284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:59:27 +00:00
Bill Yi
3c3450c3c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9c3c51727 -s ours am: 5893c50790 -s ours am: 218d23b582 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib84c9f0c9833da9350ae5f2b0c597391f4291296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:59:12 +00:00
Adam Bookatz
08b227c850 Merge "Ensure getUserName cannot return null" into tm-dev am: 1503b56202 am: 10b45a2107 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18126297

Change-Id: I3d6a7beabadc6253f44b4455f20871dcd845643e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:59:07 +00:00
Automerger Merge Worker
e1491e855d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 674a6a1474 -s ours" into tm-dev am: 7e170b45c3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I715c99c0976de3fc7703789a8eaa4e34a0632e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:58:47 +00:00