Commit Graph

69632 Commits

Author SHA1 Message Date
Amy Hsu
048eb1b00a Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b am: e67e058f26 am: 5e8ba70140
Change-Id: If073b3d860cbc53ac62548e7e211c512dfe42d0a
2020-05-20 09:18:48 +00:00
TreeHugger Robot
eb655e4098 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours am: 5c655b06a2 -s ours am: 7d40624fe1 -s ours
am skip reason: subject contains skip directive

Change-Id: I72f864db3e50e97e494ee6f2e26f632e5efaede8
2020-05-20 09:18:29 +00:00
TreeHugger Robot
6992256d5f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: 4af7cebe18 -s ours am: 8233c0573f -s ours am: bd9020b7fb -s ours
am skip reason: subject contains skip directive

Change-Id: I31a963d7baf6ea510edabb729d3db8919d5013f0
2020-05-20 09:18:23 +00:00
TreeHugger Robot
ab2a707d18 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours am: ede8bf5f96 -s ours am: 8eeabd86cf -s ours
am skip reason: subject contains skip directive

Change-Id: Ia54d1b92e11a9a3a928ccbcff58cd0e9301e6db5
2020-05-20 09:18:16 +00:00
TreeHugger Robot
6cf3a2697a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours am: ef8dff39c9 -s ours am: 7420219600 -s ours
am skip reason: subject contains skip directive

Change-Id: I6d514f9c7e3472bee5631c0141ccadfe8b3e007d
2020-05-20 09:18:09 +00:00
TreeHugger Robot
f1d62a13cb [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours am: 28621803f4 -s ours am: 78ca90d7f4 -s ours
am skip reason: subject contains skip directive

Change-Id: I4670b3b497492a6a0ee0249080358404ec732abe
2020-05-20 09:17:45 +00:00
Amy Hsu
5e8ba70140 Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b am: e67e058f26
Change-Id: I7fc511dba6f739653494c68753e191c8091f33b9
2020-05-20 08:58:34 +00:00
TreeHugger Robot
7d40624fe1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours am: 5c655b06a2 -s ours
am skip reason: subject contains skip directive

Change-Id: I3023f21efe715894fa139bcf44976c38386eb459
2020-05-20 08:58:20 +00:00
TreeHugger Robot
bd9020b7fb [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: 4af7cebe18 -s ours am: 8233c0573f -s ours
am skip reason: subject contains skip directive

Change-Id: I420b4a3412d41c8005f1484cecc3fc60569145d4
2020-05-20 08:58:10 +00:00
TreeHugger Robot
8eeabd86cf [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours am: ede8bf5f96 -s ours
am skip reason: subject contains skip directive

Change-Id: If9af7ffd99b45dc98c3e8588a420ad0b44ae1510
2020-05-20 08:58:02 +00:00
TreeHugger Robot
7420219600 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours am: ef8dff39c9 -s ours
am skip reason: subject contains skip directive

Change-Id: I2539a96dea3d1af2474d5ad1a2381548239af4f6
2020-05-20 08:57:57 +00:00
TreeHugger Robot
8233c0573f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: 4af7cebe18 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia78ce324f66fa421d4eed56ea201ae731d56f618
2020-05-20 08:57:57 +00:00
Amy Hsu
e67e058f26 Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b
Change-Id: I19d32b304c6988ece475d30ce9c9165120d84a6c
2020-05-20 08:57:55 +00:00
TreeHugger Robot
ef8dff39c9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours
am skip reason: subject contains skip directive

Change-Id: Iacb71f66379d50a479671559c830a56a67dce531
2020-05-20 08:57:47 +00:00
TreeHugger Robot
78ca90d7f4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours am: 28621803f4 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaebc96dc935e2bbdbf006e0a53bb0322e36672ca
2020-05-20 08:57:41 +00:00
TreeHugger Robot
5c655b06a2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours
am skip reason: subject contains skip directive

Change-Id: I5ffcea95d88a2ba67edd6cc420bec607e2765eb0
2020-05-20 08:57:37 +00:00
Amy Hsu
f18ab3712b Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f
Change-Id: I71ba7d138d710e02a7b486940cced02c8dde9e57
2020-05-20 08:50:48 +00:00
Amy Hsu
a75dddbf9f Merge "Move PeakRefreshRateController to Settings app" into rvc-dev 2020-05-20 08:48:56 +00:00
TreeHugger Robot
4af7cebe18 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours
am skip reason: subject contains skip directive

Change-Id: I54dc9b432f4b13258c3ff07c789ab4fcc57de45e
2020-05-20 08:43:38 +00:00
TreeHugger Robot
cb56953dca [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours
am skip reason: subject contains skip directive

Change-Id: I59a7f6597789f6bea36a28cc05e0fdd879cb1ab2
2020-05-20 08:43:28 +00:00
TreeHugger Robot
28621803f4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours
am skip reason: subject contains skip directive

Change-Id: I765701491e6cebbe89a71942d79cb959fc40d659
2020-05-20 08:32:21 +00:00
TreeHugger Robot
ede8bf5f96 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours
am skip reason: subject contains skip directive

Change-Id: I3cf7fe65b1ad1366aa48661e1fb15e71c6ee0764
2020-05-20 08:32:16 +00:00
TreeHugger Robot
a47d90f59c Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-20 08:30:46 +00:00
TreeHugger Robot
3041c88e65 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-20 08:20:55 +00:00
Automerger Merge Worker
b0bc07ff9e Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: a9bc27d354 -s ours" into rvc-d1-dev-plus-aosp am: a88d8f79a6 -s ours am: a0e10b84ee -s ours
am skip reason: subject contains skip directive

Change-Id: I20ea2a5d9e0106a4b602fc41cbd93e6c75857cc6
2020-05-20 07:47:41 +00:00
TreeHugger Robot
dba434acb6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: 3d5669a8b4 -s ours am: 1e4fc3c6fe -s ours am: 49090d1614 -s ours
am skip reason: subject contains skip directive

Change-Id: I76536b4f7960eb162e0b0807cf626bb7ea999650
2020-05-20 07:47:34 +00:00
Automerger Merge Worker
695d54e4c6 Merge "Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: baad4770c0" into rvc-d1-dev-plus-aosp am: 7c5eed987f am: e3047f425c
Change-Id: I0e686fd8ffd393a4217d4b1ec8d53907e2468a93
2020-05-20 07:47:27 +00:00
TreeHugger Robot
405704471c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: a9bc27d354 -s ours am: 8b1d467def -s ours am: 93ca2601ef -s ours
am skip reason: subject contains skip directive

Change-Id: I370e98a3fe96accd26893f76e38f7275da636c36
2020-05-20 07:46:50 +00:00
Automerger Merge Worker
6bc2e745ea Merge "Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: baad4770c0 am: 2e3c04571e" into rvc-qpr-dev-plus-aosp am: 71b52ffb2f
Change-Id: Ic9eb97954cf4052edb72d4f48213be06b464d591
2020-05-20 07:46:30 +00:00
TreeHugger Robot
6b29e7a567 Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: b5a3893f76 am: 2772005888 am: 4210565481
Change-Id: I785a1360fb3151a2249dcc0ace63e81f59a0048a
2020-05-20 07:45:32 +00:00
Automerger Merge Worker
a0e10b84ee Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: a9bc27d354 -s ours" into rvc-d1-dev-plus-aosp am: a88d8f79a6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic7b033727834172133a126b40304df960b1f6a06
2020-05-20 07:27:06 +00:00
TreeHugger Robot
49090d1614 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: 3d5669a8b4 -s ours am: 1e4fc3c6fe -s ours
am skip reason: subject contains skip directive

Change-Id: I8d32a3c13c27cc1a47b0363c794a5f0ff9954248
2020-05-20 07:27:00 +00:00
Automerger Merge Worker
e3047f425c Merge "Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: baad4770c0" into rvc-d1-dev-plus-aosp am: 7c5eed987f
Change-Id: I85aeb033ea77eb4f8d2ecf75c73972b0146c3e90
2020-05-20 07:26:41 +00:00
TreeHugger Robot
93ca2601ef [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: a9bc27d354 -s ours am: 8b1d467def -s ours
am skip reason: subject contains skip directive

Change-Id: Ifada17ce3685d9b49532491b5bf462211a123450
2020-05-20 07:26:33 +00:00
Automerger Merge Worker
71b52ffb2f Merge "Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: baad4770c0 am: 2e3c04571e" into rvc-qpr-dev-plus-aosp 2020-05-20 07:26:00 +00:00
TreeHugger Robot
4210565481 Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: b5a3893f76 am: 2772005888
Change-Id: I26328143ae9fe3363a743cc531c851c6ae9dcd48
2020-05-20 07:25:54 +00:00
TreeHugger Robot
70cd1739f8 Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: baad4770c0 am: 2e3c04571e
Change-Id: Ib1273180ca82ea69c3e9498abc2a46a201495df9
2020-05-20 07:25:54 +00:00
TreeHugger Robot
8b1d467def [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: a9bc27d354 -s ours
am skip reason: subject contains skip directive

Change-Id: I0fed732fcaede7119886314f72df06e82d1ea669
2020-05-20 07:08:37 +00:00
Automerger Merge Worker
a88d8f79a6 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: a9bc27d354 -s ours" into rvc-d1-dev-plus-aosp 2020-05-20 07:08:11 +00:00
TreeHugger Robot
2cd0e11b77 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: a9bc27d354 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie3548bef7248f4e01076512026abc1927c24bb3e
2020-05-20 07:08:07 +00:00
TreeHugger Robot
1e4fc3c6fe [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours am: 3d5669a8b4 -s ours
am skip reason: subject contains skip directive

Change-Id: I57d573438afe9ffd630695772a36df7dbaf780ae
2020-05-20 07:08:03 +00:00
Automerger Merge Worker
7c5eed987f Merge "Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: baad4770c0" into rvc-d1-dev-plus-aosp 2020-05-20 07:08:00 +00:00
TreeHugger Robot
6794d96117 Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: baad4770c0
Change-Id: I8615aa94626753e03018f8f89815707584d0ebea
2020-05-20 07:07:55 +00:00
TreeHugger Robot
2e3c04571e Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: baad4770c0
Change-Id: Iadca9c98861ac8948753fcaa9d2177fee69c5722
2020-05-20 07:07:53 +00:00
TreeHugger Robot
2772005888 Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: b5a3893f76
Change-Id: Id0cf38066b99d6c77bc39aac55b81cd943b85460
2020-05-20 07:07:51 +00:00
TreeHugger Robot
3d5669a8b4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours
am skip reason: subject contains skip directive

Change-Id: I288af7e67934943ec684587a52a7fa4771234a99
2020-05-20 07:07:19 +00:00
TreeHugger Robot
a9bc27d354 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours
am skip reason: subject contains skip directive

Change-Id: I33022c24e7871a21af8bcc650307ef5faa82fab9
2020-05-20 07:07:11 +00:00
TreeHugger Robot
77429677b2 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-20 07:05:37 +00:00
TreeHugger Robot
b5a3893f76 Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209
Change-Id: Ib8f58a2e5930dfd4f3b8a25dcd0d02d4455a5b24
2020-05-20 06:43:42 +00:00
TreeHugger Robot
baad4770c0 Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209
Change-Id: Id0d60022a25d1bb963127fbb68c80c60b9f8bd47
2020-05-20 06:43:31 +00:00