Commit Graph

663585 Commits

Author SHA1 Message Date
TreeHugger Robot
e37bdf522a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4a3fbd5851 -s ours am: 8157eb692a -s ours
am skip reason: subject contains skip directive

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

Change-Id: If0e6dc233b3a3e480b65631f230f02f2a8ab80cc
2022-01-27 05:56:45 +00:00
TreeHugger Robot
19b15bb6c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0a0426bd40 -s ours am: abcd4d286b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I807443ef15d7000a5131597a519f8c06c8340fdf
2022-01-27 05:56:28 +00:00
TreeHugger Robot
8af870eb95 Merge changes from topic "presubmit-am-e4978075937f4e43aa46e37caf0dc425" into sc-qpr1-dev am: 9a1f59b4c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16721669

Change-Id: Ib42516f168fc720e753d13288d7953eded8d773b
2022-01-27 05:56:08 +00:00
Bill Yi
36ae9fe4c4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e82ce9fd51 am: 36fd687019 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I88784eeada393cd2bf4885e786669f1c0bf1031a
2022-01-27 05:56:01 +00:00
TreeHugger Robot
8157eb692a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4a3fbd5851 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4a5b40ddb71a7fed7b97fdb15660acf7d65f8c0b
2022-01-27 05:55:33 +00:00
TreeHugger Robot
abea7d38ab Merge changes from topic "presubmit-am-1bdc6596abc94ed48e398e34bf8604a6" into sc-qpr1-dev am: 723b27a11d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16720774

Change-Id: Idb497c3f013db8d7e16eb537930142e730051102
2022-01-27 05:55:30 +00:00
Bill Yi
dc56ec8286 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 438f56d10c am: eb5ecbde7a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I755f19696a31505efa1d3dd5ec845955ad2baa16
2022-01-27 05:55:23 +00:00
TreeHugger Robot
abcd4d286b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0a0426bd40 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If4dfbe72ecd50a2931b668b2996f39fa9a172906
2022-01-27 05:55:20 +00:00
TreeHugger Robot
9a1f59b4c8 Merge changes from topic "presubmit-am-e4978075937f4e43aa46e37caf0dc425" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e82ce9fd51
  Import translations. DO NOT MERGE ANYWHERE
2022-01-27 05:41:32 +00:00
TreeHugger Robot
4a3fbd5851 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-27 05:41:32 +00:00
TreeHugger Robot
723b27a11d Merge changes from topic "presubmit-am-1bdc6596abc94ed48e398e34bf8604a6" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 438f56d10c
  Import translations. DO NOT MERGE ANYWHERE
2022-01-27 05:36:41 +00:00
TreeHugger Robot
0a0426bd40 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-27 05:36:41 +00:00
TreeHugger Robot
57e7eba08f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: efbb02e704 -s ours am: d484686e58 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10b2cd61053aec97a4b420101a77bfba4baeebcf
2022-01-27 04:55:09 +00:00
Frank Li
9b2173796b Merge "[DU11]Remove NetworkStats hiddden API dependencies" am: dc23434bd5 am: 09b42ebd3c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958915

Change-Id: Ieddbdc2faa69face2fbfc0a332d2696cda895402
2022-01-27 04:53:58 +00:00
TreeHugger Robot
d484686e58 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: efbb02e704 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic05909045ffc11ff7a185a6d8eeecf32e9637fd9
2022-01-27 04:42:14 +00:00
Frank Li
09b42ebd3c Merge "[DU11]Remove NetworkStats hiddden API dependencies" am: dc23434bd5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958915

Change-Id: Ic818de9de5e0e8ea67848df9e2d247d671a09194
2022-01-27 04:41:26 +00:00
TreeHugger Robot
d0b3871438 Merge changes from topic "presubmit-am-aa055fd7a8a84c0ebcfface10787a9e8" into sc-qpr1-dev am: d9bacad89c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16722530

Change-Id: I233fe2354e1a64ac65a87d313c103d1ba77072fb
2022-01-27 04:38:00 +00:00
Bill Yi
29ef9c8f77 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6e4af674a am: 4289a15ed3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d1f6fb3cb7c59e0874a8e448d03ed315c49db77
2022-01-27 04:37:55 +00:00
TreeHugger Robot
577390f759 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 871aa4262f -s ours am: c40725a57b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic5dce643cbc864e6755dbf1e4886958ed53c1ee1
2022-01-27 04:37:42 +00:00
TreeHugger Robot
efbb02e704 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-27 04:37:35 +00:00
TreeHugger Robot
d9bacad89c Merge changes from topic "presubmit-am-aa055fd7a8a84c0ebcfface10787a9e8" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6e4af674a
  Import translations. DO NOT MERGE ANYWHERE
2022-01-27 04:37:35 +00:00
TreeHugger Robot
b6619256ae Merge changes from topic "presubmit-am-f3c9c8d2f3cc42109908dbad1153c587" into sc-qpr1-dev am: 7dc62fe70a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16722344

Change-Id: If31366efe8c05be3fae2e242bbcedfb900844527
2022-01-27 04:37:28 +00:00
Bill Yi
630d6c68e2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9829ca31f5 am: 2f020d6eda -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a71aab77fd722b98f804580854b5d63f22092cd
2022-01-27 04:37:22 +00:00
TreeHugger Robot
c40725a57b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 871aa4262f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0eda2926fffdb66f3c6376a7240eca03071c402b
2022-01-27 04:37:06 +00:00
Frank Li
dc23434bd5 Merge "[DU11]Remove NetworkStats hiddden API dependencies" 2022-01-27 04:27:41 +00:00
TreeHugger Robot
871aa4262f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-27 04:17:11 +00:00
TreeHugger Robot
7dc62fe70a Merge changes from topic "presubmit-am-f3c9c8d2f3cc42109908dbad1153c587" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9829ca31f5
  Import translations. DO NOT MERGE ANYWHERE
2022-01-27 04:17:11 +00:00
Chris Li
b91693b117 Merge "Block animation transfer after surface animation finishes." am: 4e54b2f3f9 am: 8057c823bf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948189

Change-Id: I5af2fa814deca6d6e454fb75aa9c69e38988e854
2022-01-27 03:51:05 +00:00
Chris Li
8057c823bf Merge "Block animation transfer after surface animation finishes." am: 4e54b2f3f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948189

Change-Id: I69393cee760a4793319efdc53fdd2e071f9dbb4d
2022-01-27 03:34:05 +00:00
Chris Li
4e54b2f3f9 Merge "Block animation transfer after surface animation finishes." 2022-01-27 03:17:35 +00:00
Treehugger Robot
c15388da45 Merge "Create EVENT_TRAFFIC_DESCRIPTORS_UPDATED" am: 35ac7e34ce am: d47e88e58c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1917117

Change-Id: I8bb65c4e479224ce09674696e0e70ff61de9f643
2022-01-27 02:24:45 +00:00
Treehugger Robot
d47e88e58c Merge "Create EVENT_TRAFFIC_DESCRIPTORS_UPDATED" am: 35ac7e34ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1917117

Change-Id: Ic2639d45654cd0635fdaadcec5ca3de9e116fbd3
2022-01-27 02:07:38 +00:00
Treehugger Robot
35ac7e34ce Merge "Create EVENT_TRAFFIC_DESCRIPTORS_UPDATED" 2022-01-27 01:49:59 +00:00
Hans Boehm
a2e1dc8b9a Merge "Prefer WeakReference.refersTo() to get()" am: 63e3c2c709 am: aca7bb4b9f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956816

Change-Id: I626a291208a3063b93cdd0ef1de131162cc916cb
2022-01-27 00:50:30 +00:00
Hans Boehm
aca7bb4b9f Merge "Prefer WeakReference.refersTo() to get()" am: 63e3c2c709
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956816

Change-Id: I010f99e4de0cb60fecd6b6af38a17e695fc773e8
2022-01-27 00:37:24 +00:00
Hans Boehm
63e3c2c709 Merge "Prefer WeakReference.refersTo() to get()" 2022-01-27 00:22:02 +00:00
TreeHugger Robot
afcacbe236 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: bc914ff44f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0437e119180c9afea136b20ea868f3a1c5fe9e3a
2022-01-26 22:46:42 +00:00
Nathan Harold
c6461bb7f7 Merge "Expose Constructor for ModemActivityInfoException" am: 5887444f2d am: 145cbd8f52
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960939

Change-Id: I15f5b24879c291f0b775eea62fc6863e8c52e8bc
2022-01-26 22:39:39 +00:00
TreeHugger Robot
bc914ff44f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-26 22:29:28 +00:00
Nathan Harold
145cbd8f52 Merge "Expose Constructor for ModemActivityInfoException" am: 5887444f2d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960939

Change-Id: Ia34ddf4ce1376667bb480859abc4e82d6330637b
2022-01-26 22:21:25 +00:00
Nathan Harold
5887444f2d Merge "Expose Constructor for ModemActivityInfoException" 2022-01-26 22:00:07 +00:00
Bill Yi
a00c9b343e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50c9554ebc -s ours am: feb7ccf7d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia31f28a40944c27f08cc91f11b09c95f3f7002c5
2022-01-26 21:51:50 +00:00
TreeHugger Robot
dd5d018e0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 80d3c80fdc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4862455ef1ebda3791e0cb51811742b8b62dba5
2022-01-26 21:50:58 +00:00
Bill Yi
feb7ccf7d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 50c9554ebc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I269dd8f16ca63a3a96d63463e63649dd16ec9a7d
2022-01-26 21:50:53 +00:00
TreeHugger Robot
80d3c80fdc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-26 21:47:45 +00:00
TreeHugger Robot
b25fa3a579 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 35fced00d7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If9e58bc4cb1458a0bc3dcd849b5eb81f3abd602d
2022-01-26 21:45:38 +00:00
TreeHugger Robot
6629db24b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: ce235c1a97 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I662637129cba879542f984802e00943d4df03ea8
2022-01-26 21:45:24 +00:00
TreeHugger Robot
b10ed4edcd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 9eaef67c7a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I70f9dd5a6854666d98bba42122330753f4ee7a55
2022-01-26 21:45:11 +00:00
Bill Yi
84b8a810d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81af6fe33d -s ours
am skip reason: subject contains skip directive

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

Change-Id: If7a3f482e414e08519d8a912690f567d71fe52b3
2022-01-26 21:44:55 +00:00
TreeHugger Robot
35fced00d7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-26 21:41:17 +00:00