Commit Graph

684258 Commits

Author SHA1 Message Date
TreeHugger Robot
d77ce78a76 Merge changes from topic "presubmit-am-1bdc6596abc94ed48e398e34bf8604a6" into sc-qpr1-dev am: 723b27a11d am: b7704ac989
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16720774

Change-Id: If103e38e1d669b4cd1c94194c3fd647c83479666
2022-01-27 06:06:50 +00:00
Bill Yi
c8d98d3fa3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 438f56d10c am: eb5ecbde7a -s ours am: 417389f30c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I258853f7fb75770febb6842bb493eee1f0d06712
2022-01-27 06:06:43 +00:00
TreeHugger Robot
b7704ac989 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: Ida79e39495635b2d9a5bb16b23993dc5e190a3ce
2022-01-27 05:55:26 +00:00
Bill Yi
417389f30c [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: Ia6a360345c41be2ae5de20b294df5b2029157043
2022-01-27 05:55:25 +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
521ada0111 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: efbb02e704 -s ours am: d484686e58 -s ours am: eea5f95ab1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia99f2a9f3f02c1d34e978d112180ab924b4a1103
2022-01-27 04:56:33 +00:00
Automerger Merge Worker
1a25779d73 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: efbb02e704 -s ours am: d484686e58 -s ours am: 57e7eba08f -s ours" into sc-v2-dev-plus-aosp 2022-01-27 04:56:32 +00:00
Automerger Merge Worker
7dc257bf74 Merge changes from topic "am-9ffc56c33d6e48c9bec7223ec4f11d94" into sc-v2-dev-plus-aosp
* changes:
  Merge changes from topic "presubmit-am-aa055fd7a8a84c0ebcfface10787a9e8" into sc-qpr1-dev am: d9bacad89c am: 0f36e3a1b2
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6e4af674a am: 4289a15ed3 -s ours am: eddac29061 -s ours
2022-01-27 04:56:27 +00:00
TreeHugger Robot
23ed62bc68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: efbb02e704 -s ours am: d484686e58 -s ours am: 57e7eba08f -s ours
am skip reason: subject contains skip directive

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

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

Change-Id: I3e070b527c304900a2cc181efb28cc78fcf52fc3
2022-01-27 04:56:19 +00:00
TreeHugger Robot
8127bfd525 Merge changes from topic "presubmit-am-aa055fd7a8a84c0ebcfface10787a9e8" into sc-qpr1-dev am: d9bacad89c am: 0f36e3a1b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16722530

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

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

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

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

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

Change-Id: Ib97f6542e75fa2b4453166d518071d714d7f5f41
2022-01-27 04:56:02 +00:00
TreeHugger Robot
38106d6ae8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 871aa4262f -s ours am: c40725a57b -s ours am: 147617b7a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I63cbb4aea8613fdc703de1cbc59a64e30972d41f
2022-01-27 04:55:32 +00:00
Automerger Merge Worker
616f767f5b Merge changes from topic "am-3683c69bf0644993a64a0786c0470eae" into sc-v2-dev-plus-aosp
* changes:
  Merge changes from topic "presubmit-am-f3c9c8d2f3cc42109908dbad1153c587" into sc-qpr1-dev am: 7dc62fe70a am: 24124ca9fb
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9829ca31f5 am: 2f020d6eda -s ours am: 635b431a08 -s ours
2022-01-27 04:55:12 +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
TreeHugger Robot
1bf7cd4913 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 871aa4262f -s ours am: c40725a57b -s ours am: 577390f759 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I96dab97839d84b62fba794fe5671dae4ca75e4e8
2022-01-27 04:54:57 +00:00
TreeHugger Robot
3c0c8e1a3d Merge changes from topic "presubmit-am-f3c9c8d2f3cc42109908dbad1153c587" into sc-qpr1-dev am: 7dc62fe70a am: 24124ca9fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16722344

Change-Id: I709b4fd97ffe99991e59938b511b144c9c4603eb
2022-01-27 04:54:34 +00:00
TreeHugger Robot
99b01bb4fa Merge changes from topic "presubmit-am-f3c9c8d2f3cc42109908dbad1153c587" into sc-qpr1-dev am: 7dc62fe70a am: b6619256ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16722344

Change-Id: I3b61ec1023f7b1264b064932c94a6213d2459bdb
2022-01-27 04:54:15 +00:00
Bill Yi
dc3f28c773 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9829ca31f5 am: 2f020d6eda -s ours am: 635b431a08 -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I5a9dc02613911c28a91c35d3261291c8a3557525
2022-01-27 04:54:00 +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
eea5f95ab1 [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: I026487f958661062ce25a1d81109c5b480ff6a6c
2022-01-27 04:42:41 +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
TreeHugger Robot
0f36e3a1b2 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: Id395c10908d96a8c6695a298ac5e65639fe89052
2022-01-27 04:42:14 +00:00
Bill Yi
eddac29061 [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: I9881d6dea211b1329bc6196cf5b39d0b26453582
2022-01-27 04:42:12 +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
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
efbb02e704 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-27 04:37:35 +00:00
TreeHugger Robot
147617b7a2 [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: I1b5e8ba43bc7fd2413e94062dde15cd777570895
2022-01-27 04:37:28 +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
24124ca9fb 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: I0abf3d73867ce33ad57a5ca5be3aa9ef77f4826d
2022-01-27 04:37:20 +00:00
Bill Yi
635b431a08 [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: I7906658a328583e3633875727fec2c9f61347fbd
2022-01-27 04:37:18 +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
d22c7cf16e Merge "Block animation transfer after surface animation finishes." am: 4e54b2f3f9 am: 8057c823bf am: b91693b117
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948189

Change-Id: I917c4c8e5fe8773e694a6e36aa6ec6b36fb85fd9
2022-01-27 04:06:23 +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
39173ceda9 Merge "Create EVENT_TRAFFIC_DESCRIPTORS_UPDATED" am: 35ac7e34ce am: d47e88e58c am: c15388da45
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1917117

Change-Id: Ia1614829270826538a56e92ec1946ab73308d970
2022-01-27 02:45:22 +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