Bill Yi
|
e82171dfa0
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I63acabfe467cf8482e6cfa2b5fe51b2e697fcf1b
|
2021-08-16 20:30:20 -07:00 |
|
Jeff DeCew
|
7d3b5a44e5
|
Merge "FooterView color logic cleanup" into sc-qpr1-dev am: 3e7384fbe2 am: 6381b7c63a am: ae8476962a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549419
Change-Id: I8ca1b4f543824dda2e97e8d68edffb1c63f370de
|
2021-08-16 21:03:34 +00:00 |
|
Automerger Merge Worker
|
c3ad658595
|
Merge changes from topic "am-47d783f4969b4aebbeba9615efda35a7" into sc-v2-dev-plus-aosp am: 649326e41c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I2ffa5d838c6f69232ca1dc78f638c6ec2c9c40cd
|
2021-08-16 21:03:13 +00:00 |
|
Neha Jain
|
3e532425eb
|
[automerger skipped] Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 am: 7c51d30f77 -s ours am: 4fb914b0b5 -s ours am: baceccf06d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I3e6bd234acdf569b87993773af304abbaacb8c7d
|
2021-08-16 21:03:04 +00:00 |
|
Jeff DeCew
|
9aebd83718
|
Merge "FooterView color logic cleanup" into sc-qpr1-dev am: 3e7384fbe2 am: aba6cc0a73 am: c80936eede
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549419
Change-Id: Iec0489d718bfbe6e228496fd53b17c939b3c3af8
|
2021-08-16 21:02:33 +00:00 |
|
Neha Jain
|
c1267a128d
|
[automerger skipped] Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 am: 7c51d30f77 am: b58db8a757 -s ours am: b28c6bfbf7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I2b75fbf9002a849a4633ad5cb11e038b1818dfff
|
2021-08-16 21:02:14 +00:00 |
|
Evan Laird
|
1f315e0504
|
[automerger skipped] DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29 am: 2270569990 am: f7c5e4be9b -s ours am: 2a39aac042 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: Id4c24ab741b0c78775aab0b609a01613da3f8dcf
|
2021-08-16 21:02:05 +00:00 |
|
Neha Jain
|
b26d50221e
|
[automerger skipped] Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 am: eaea8772e9 am: 7860f54665 -s ours am: e15d05a76e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: Iece54caf5cfb2038376ecfe1053007b59d8a51bf
|
2021-08-16 21:01:42 +00:00 |
|
Evan Laird
|
7ca93c9f73
|
[automerger skipped] DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29 am: 4d38a8d038 am: cee4b89a43 -s ours am: 9043c36443 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: Ib42482a13c403db9cac3df90d8bd35a8dd3e2a5b
|
2021-08-16 21:01:20 +00:00 |
|
Jeff DeCew
|
ae8476962a
|
Merge "FooterView color logic cleanup" into sc-qpr1-dev am: 3e7384fbe2 am: 6381b7c63a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549419
Change-Id: I9f532333b27908bedfa8b44fa4736b322ca7364b
|
2021-08-16 20:47:18 +00:00 |
|
Automerger Merge Worker
|
649326e41c
|
Merge changes from topic "am-47d783f4969b4aebbeba9615efda35a7" into sc-v2-dev-plus-aosp
* changes:
[automerger skipped] Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 am: 7c51d30f77 -s ours am: 4fb914b0b5 -s ours
[automerger skipped] DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29 am: 2270569990 -s ours am: 58e803e566 -s ours
|
2021-08-16 20:47:13 +00:00 |
|
Neha Jain
|
baceccf06d
|
[automerger skipped] Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 am: 7c51d30f77 -s ours am: 4fb914b0b5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I9a3064502140866fd7366e72629278afbd2812dd
|
2021-08-16 20:47:08 +00:00 |
|
Jeff DeCew
|
c80936eede
|
Merge "FooterView color logic cleanup" into sc-qpr1-dev am: 3e7384fbe2 am: aba6cc0a73
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549419
Change-Id: I156d60c7131b824d146fbdffd0fb7c467f9bce3c
|
2021-08-16 20:47:00 +00:00 |
|
Evan Laird
|
1608f2b4fa
|
[automerger skipped] DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29 am: 2270569990 -s ours am: 58e803e566 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I2409b22b42676c19d2ace003635694ba0cb0f29c
|
2021-08-16 20:46:59 +00:00 |
|
Neha Jain
|
b28c6bfbf7
|
[automerger skipped] Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 am: 7c51d30f77 am: b58db8a757 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: Ic9f8e9757c0111bde88e3b2e0d4b0759ee7444ac
|
2021-08-16 20:46:56 +00:00 |
|
Evan Laird
|
2a39aac042
|
[automerger skipped] DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29 am: 2270569990 am: f7c5e4be9b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: Id53738049c7aa5fc36e626972f950145425fdfd6
|
2021-08-16 20:46:55 +00:00 |
|
Neha Jain
|
e15d05a76e
|
[automerger skipped] Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 am: eaea8772e9 am: 7860f54665 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: Id326e69d7bc3b5805f8ee653093d9f7a0f74fdb6
|
2021-08-16 20:46:47 +00:00 |
|
Evan Laird
|
9043c36443
|
[automerger skipped] DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29 am: 4d38a8d038 am: cee4b89a43 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I37a6af153ab4658abdfef588e91eaed4df2e26b0
|
2021-08-16 20:46:36 +00:00 |
|
Chris Tate
|
3dbd080490
|
Merge "Restrict cross-user wallpaper inspection"
|
2021-08-16 20:36:09 +00:00 |
|
Evan Rosky
|
434d8fd100
|
Merge "Don't prematurely commit visibility in consecutive shell transitions" into sc-v2-dev am: c15da41746 am: 46b97fd4c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523530
Change-Id: I55e363553e308c5920c4da0d5696162591079fbc
|
2021-08-16 20:32:53 +00:00 |
|
Jeff DeCew
|
aba6cc0a73
|
Merge "FooterView color logic cleanup" into sc-qpr1-dev am: 3e7384fbe2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549419
Change-Id: Ica7f35ecea2c2a4119a6efb6b19048d07c817846
|
2021-08-16 20:29:37 +00:00 |
|
Neha Jain
|
b58db8a757
|
Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 am: 7c51d30f77
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: Id68721b829b75ab93bcdec54f7da546c76b1e049
|
2021-08-16 20:29:16 +00:00 |
|
Jeff DeCew
|
6381b7c63a
|
Merge "FooterView color logic cleanup" into sc-qpr1-dev am: 3e7384fbe2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549419
Change-Id: I7b92058ba3fee7ab415c95803493f81d85f98793
|
2021-08-16 20:29:14 +00:00 |
|
Neha Jain
|
4fb914b0b5
|
[automerger skipped] Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 am: 7c51d30f77 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I3375c1d01d9bfc537a40996bfb716eeb8b058b29
|
2021-08-16 20:29:09 +00:00 |
|
Evan Laird
|
58e803e566
|
[automerger skipped] DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29 am: 2270569990 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I5b58323a1de06144ab8215741adb3e562f60bfe1
|
2021-08-16 20:29:07 +00:00 |
|
Evan Laird
|
f7c5e4be9b
|
DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29 am: 2270569990
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I4fae4a6a867a1811a59ccf8ffb5b95ae16c0bcb3
|
2021-08-16 20:29:06 +00:00 |
|
Neha Jain
|
7860f54665
|
Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 am: eaea8772e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I73d96cf27d4d98f19e2e8c2b9a40605cddbf29ab
|
2021-08-16 20:28:48 +00:00 |
|
Evan Laird
|
cee4b89a43
|
DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29 am: 4d38a8d038
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I003ab66ed4727a9fc19d9fbee5290b1d98df4d0a
|
2021-08-16 20:28:45 +00:00 |
|
Neha Jain
|
fe00942347
|
[automerger skipped] Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7 am: 76faa52552 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: Ic4ec6c2c3039067b68eff8ccbf120c74b5821977
|
2021-08-16 20:28:37 +00:00 |
|
Evan Laird
|
179e045540
|
[automerger skipped] DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29 am: 50ae33c210 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I1df072b1372bb2c96e449648b543a23f7c17e29a
|
2021-08-16 20:28:21 +00:00 |
|
Evan Rosky
|
46b97fd4c0
|
Merge "Don't prematurely commit visibility in consecutive shell transitions" into sc-v2-dev am: c15da41746
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523530
Change-Id: Idb6ddeedfc40fbd926ee7240e8b9154bd39495ba
|
2021-08-16 20:15:28 +00:00 |
|
Jeff DeCew
|
3e7384fbe2
|
Merge "FooterView color logic cleanup" into sc-qpr1-dev
|
2021-08-16 20:12:59 +00:00 |
|
Neha Jain
|
7c51d30f77
|
Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I875e675d2740e1bdeb7356e6aa1ba88dd463ef2c
|
2021-08-16 20:12:02 +00:00 |
|
Evan Laird
|
2270569990
|
DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I43d21926050499232df9b41b94bdf60ff77369c6
|
2021-08-16 20:11:55 +00:00 |
|
Neha Jain
|
76faa52552
|
Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I1ab7b11f2d0947f3b5b63b13debca32fa3e4a8d7
|
2021-08-16 20:11:49 +00:00 |
|
Evan Laird
|
50ae33c210
|
DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I2798230810fb16192418b25c8e51718615fd8381
|
2021-08-16 20:11:44 +00:00 |
|
Neha Jain
|
eaea8772e9
|
Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev am: def23772a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: Ic923a4798478b33e122cb9625043d230b0c06aa7
|
2021-08-16 20:11:25 +00:00 |
|
Evan Laird
|
4d38a8d038
|
DO NOT MERGE: Register NetworkController to DumpManager am: 2b79873e29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561037
Change-Id: I0fdc922d4d6ab7c0d0f291e4c93307047c0713d5
|
2021-08-16 20:11:18 +00:00 |
|
Huihong Luo
|
3b24e5af28
|
Merge "Remove Webview Overlays on destroy" into sc-dev am: e44bc77bc3 am: dc7594b513 am: 77cee97975 am: 10adbe632b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546814
Change-Id: I0a1f501d278129818d8ef0ff17eeea463d870590
|
2021-08-16 20:08:57 +00:00 |
|
Jeff DeCew
|
28f6cc6e4e
|
Merge changes I09b3999a,I590be0ba into sc-qpr1-dev am: 10c7e2b811 am: 262b278197 am: 783a57cb4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549414
Change-Id: I919bbb05878117dc64a8c51ee13e592abf28715e
|
2021-08-16 20:08:37 +00:00 |
|
Huihong Luo
|
cdcd8fe1f5
|
Merge "Remove Webview Overlays on destroy" into sc-dev am: e44bc77bc3 am: 2f880cfa3d am: 816a24f5a2 am: 7a22dbf196
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546814
Change-Id: I7d452fc48155fd4d2c6eaa03a09c0f68a8a9190c
|
2021-08-16 20:08:11 +00:00 |
|
Huihong Luo
|
a4d262d296
|
Merge "Remove Webview Overlays on destroy" into sc-dev am: e44bc77bc3 am: dc7594b513 am: 22f14c9f5e am: b88d865bd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546814
Change-Id: Ifdbabb496d245e34a91a02e260cc762b4263d20f
|
2021-08-16 20:07:29 +00:00 |
|
Jeff DeCew
|
6b6610df79
|
Merge changes I09b3999a,I590be0ba into sc-qpr1-dev am: 10c7e2b811 am: 2de4373e93 am: 7b19b1dd94
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549414
Change-Id: I0d4fbd00d0403fc6b5c7c81a8fccd9a9d8d330d3
|
2021-08-16 20:06:42 +00:00 |
|
Evan Rosky
|
c15da41746
|
Merge "Don't prematurely commit visibility in consecutive shell transitions" into sc-v2-dev
|
2021-08-16 19:59:44 +00:00 |
|
Haiping Yang
|
a22e089f3b
|
Merge "Add brightness curve config for doze mode."
|
2021-08-16 19:58:12 +00:00 |
|
Neha Jain
|
def23772a7
|
Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev
|
2021-08-16 19:56:14 +00:00 |
|
Huihong Luo
|
10adbe632b
|
Merge "Remove Webview Overlays on destroy" into sc-dev am: e44bc77bc3 am: dc7594b513 am: 77cee97975
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546814
Change-Id: I5dc588f2691cba38dd15c03a49bc732201021bd2
|
2021-08-16 19:52:38 +00:00 |
|
Jeff DeCew
|
783a57cb4a
|
Merge changes I09b3999a,I590be0ba into sc-qpr1-dev am: 10c7e2b811 am: 262b278197
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549414
Change-Id: I8b202d20247dfcf652644101a22df8a10e0d84ee
|
2021-08-16 19:52:27 +00:00 |
|
Huihong Luo
|
7a22dbf196
|
Merge "Remove Webview Overlays on destroy" into sc-dev am: e44bc77bc3 am: 2f880cfa3d am: 816a24f5a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546814
Change-Id: Ia96bbcd9c2ea21fbb9ff505f76cce6d9921b70c0
|
2021-08-16 19:52:17 +00:00 |
|
Huihong Luo
|
b88d865bd1
|
Merge "Remove Webview Overlays on destroy" into sc-dev am: e44bc77bc3 am: dc7594b513 am: 22f14c9f5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546814
Change-Id: I4bfefa56428bf9ec171da12ef93ee401d206a522
|
2021-08-16 19:52:11 +00:00 |
|