Al Sutton
|
e838a4fb90
|
Merge "Set DEBUG_SCHEDULING to dalse by default"
|
2019-06-04 07:35:28 +00:00 |
|
Lorenzo Colitti
|
10cc610365
|
[automerger skipped] Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev am: f61e5f2410 am: ddc32a5239
am: de7e778057 -s ours
am skip reason: subject contains skip directive
Change-Id: I42af1ce6b572304180d03685ca5f04b536f85ebe
|
2019-06-03 21:38:02 -07:00 |
|
Lorenzo Colitti
|
db79569d13
|
[automerger skipped] Revert "[DO NOT MERGE] Handle config override via settings correctly" am: 69a015931e am: 2a9756bbbf
am: a0f3da03fe -s ours
am skip reason: subject contains skip directive
Change-Id: Ic05db8b34db9a2f875659b33fbbbf936f6d336b9
|
2019-06-03 21:36:10 -07:00 |
|
Lorenzo Colitti
|
de7e778057
|
Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev am: f61e5f2410
am: ddc32a5239
Change-Id: Ice0c3f3b944bc05121a529ecd2b000d9d1e9b6c4
|
2019-06-03 21:33:17 -07:00 |
|
Lorenzo Colitti
|
4503a742bc
|
[automerger skipped] Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev am: f61e5f2410 am: 52276d7e0f
am: 43ad8240bc -s ours
am skip reason: subject contains skip directive
Change-Id: Ic1b63e2ca8d772bd483c8f285f41bd4cefbfdcdd
|
2019-06-03 21:33:05 -07:00 |
|
Lorenzo Colitti
|
d52a5d141e
|
[automerger skipped] Revert "[DO NOT MERGE] Handle config override via settings correctly" am: 69a015931e am: 950cbfe797
am: 3eb90474dc -s ours
am skip reason: subject contains skip directive
Change-Id: Idceb8402399e808a58cd2be47f9fdd5753fe43b2
|
2019-06-03 21:31:22 -07:00 |
|
Lorenzo Colitti
|
a0f3da03fe
|
Revert "[DO NOT MERGE] Handle config override via settings correctly" am: 69a015931e
am: 2a9756bbbf
Change-Id: I481935004d150b1191f3b5ca3d98559ca79fb55d
|
2019-06-03 21:31:10 -07:00 |
|
Lorenzo Colitti
|
43ad8240bc
|
Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev am: f61e5f2410
am: 52276d7e0f
Change-Id: Ieee84ec2287eb400ecbb41937ab459deafdf8fb1
|
2019-06-03 21:29:17 -07:00 |
|
Lorenzo Colitti
|
3eb90474dc
|
Revert "[DO NOT MERGE] Handle config override via settings correctly" am: 69a015931e
am: 950cbfe797
Change-Id: Id3348f0c2735582b02f6d77f85469abe4e156a1e
|
2019-06-03 21:27:08 -07:00 |
|
Lucas Dupin
|
3e18e63626
|
Merge "Do not hide media metadata when bypassing LS" into qt-r1-dev am: 27c2dc5f55
am: 8d33e9b808
Change-Id: I162567276a73f4b52d9390d7ededa7e2c302b1ca
|
2019-06-03 21:26:09 -07:00 |
|
Lorenzo Colitti
|
ddc32a5239
|
Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev
am: f61e5f2410
Change-Id: Iaa1a452bce36a97ed40c52ebf0a6c5e347e80816
|
2019-06-03 21:23:11 -07:00 |
|
Lorenzo Colitti
|
2a9756bbbf
|
Revert "[DO NOT MERGE] Handle config override via settings correctly"
am: 69a015931e
Change-Id: I56dfd562bba508295999682a2fed3c2a64283131
|
2019-06-03 21:23:09 -07:00 |
|
Lucas Dupin
|
8d33e9b808
|
Merge "Do not hide media metadata when bypassing LS" into qt-r1-dev
am: 27c2dc5f55
Change-Id: I94ee905786992765f158e85f52ced4a0655bccad
|
2019-06-03 21:21:10 -07:00 |
|
Lorenzo Colitti
|
52276d7e0f
|
Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev
am: f61e5f2410
Change-Id: Ifac7c0a43c42060ed73cbb07e8b83fcfb6b3922b
|
2019-06-03 21:21:09 -07:00 |
|
Lorenzo Colitti
|
950cbfe797
|
Revert "[DO NOT MERGE] Handle config override via settings correctly"
am: 69a015931e
Change-Id: I1e1dd514df630cd9c35f6af59108dfbe31de6a20
|
2019-06-03 21:21:07 -07:00 |
|
Yao Chen
|
fcedd12eb2
|
Merge "Fix a bug in saving local history of the metrics report." into qt-dev am: 6d647b78d3 am: c50eff6dba
am: 52e9e94b6f
Change-Id: Ibeaf65b983f1446e32231e37757d30e3d0c36a17
|
2019-06-03 21:10:59 -07:00 |
|
Yao Chen
|
8a5f3d864e
|
Merge "Fix a bug in saving local history of the metrics report." into qt-dev am: 6d647b78d3 am: ae8cff710b
am: a1e379d131
Change-Id: Ib93efa140aab170df9495292b41f0b6af9211f2e
|
2019-06-03 21:09:02 -07:00 |
|
Lucas Dupin
|
27c2dc5f55
|
Merge "Do not hide media metadata when bypassing LS" into qt-r1-dev
|
2019-06-04 04:06:45 +00:00 |
|
Yao Chen
|
52e9e94b6f
|
Merge "Fix a bug in saving local history of the metrics report." into qt-dev am: 6d647b78d3
am: c50eff6dba
Change-Id: I0e497562a621d35e117180c5f4c6998d8e58ba92
|
2019-06-03 20:57:24 -07:00 |
|
Lorenzo Colitti
|
f61e5f2410
|
Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev
|
2019-06-04 03:57:07 +00:00 |
|
Yao Chen
|
a1e379d131
|
Merge "Fix a bug in saving local history of the metrics report." into qt-dev am: 6d647b78d3
am: ae8cff710b
Change-Id: Ieffff1d4dbd21cc461dd103249e8fec7c1f81099
|
2019-06-03 20:55:51 -07:00 |
|
Yao Chen
|
c50eff6dba
|
Merge "Fix a bug in saving local history of the metrics report." into qt-dev
am: 6d647b78d3
Change-Id: Ia26fc57c55fb3454aef9207bc737e857a247dc7b
|
2019-06-03 20:38:50 -07:00 |
|
Yao Chen
|
ae8cff710b
|
Merge "Fix a bug in saving local history of the metrics report." into qt-dev
am: 6d647b78d3
Change-Id: I69258e0cb237f501e2962f216396889ec0521098
|
2019-06-03 20:38:49 -07:00 |
|
Yao Chen
|
6d647b78d3
|
Merge "Fix a bug in saving local history of the metrics report." into qt-dev
|
2019-06-04 03:31:15 +00:00 |
|
Lorenzo Colitti
|
69a015931e
|
Revert "[DO NOT MERGE] Handle config override via settings correctly"
This reverts commit aa5ba4f75f.
Reason for revert: Breaks presubmits. Bootloops blueline on qt-dev.
Bug: 134445287
Change-Id: I6ad17fa66a1ddc681339966acd007ebd43d7ba3b
|
2019-06-04 03:18:12 +00:00 |
|
Matt Casey
|
72079b38ee
|
Merge "Ignore setAssistHintVisible if overlays are not available." into qt-dev am: 5eab79db10 am: 358b037079
am: 7f50589bbe
Change-Id: I1a31979a23fdb41462709caf72b14cd9fdbfd6f0
|
2019-06-03 20:03:15 -07:00 |
|
Matt Casey
|
2f09bd9a98
|
Merge "Ignore setAssistHintVisible if overlays are not available." into qt-dev am: 5eab79db10 am: ab6e97c28e
am: 5a795619e6
Change-Id: I3c94373df9b7cdb06cf03c24663496f7a623209d
|
2019-06-03 20:01:41 -07:00 |
|
Matt Casey
|
7f50589bbe
|
Merge "Ignore setAssistHintVisible if overlays are not available." into qt-dev am: 5eab79db10
am: 358b037079
Change-Id: Id6ff7034e8753c4d9375c22a75f266c394357555
|
2019-06-03 19:59:13 -07:00 |
|
Matt Casey
|
5a795619e6
|
Merge "Ignore setAssistHintVisible if overlays are not available." into qt-dev am: 5eab79db10
am: ab6e97c28e
Change-Id: Ic4915baede086753ac020cfa5c045b5b02a338eb
|
2019-06-03 19:57:36 -07:00 |
|
Matt Casey
|
358b037079
|
Merge "Ignore setAssistHintVisible if overlays are not available." into qt-dev
am: 5eab79db10
Change-Id: Ic01fff552325358e84743da927b1331d50a0f3d4
|
2019-06-03 19:51:49 -07:00 |
|
Matt Casey
|
ab6e97c28e
|
Merge "Ignore setAssistHintVisible if overlays are not available." into qt-dev
am: 5eab79db10
Change-Id: I5798fd75fed884a262155c839a76b9ce17e744d6
|
2019-06-03 19:48:11 -07:00 |
|
TreeHugger Robot
|
5eab79db10
|
Merge "Ignore setAssistHintVisible if overlays are not available." into qt-dev
|
2019-06-04 02:27:26 +00:00 |
|
Kevin Yao
|
ab19b9a405
|
Merge "User education support on disambiguation dialog" into qt-dev am: 327751f18f am: 0d2970d912
am: c64996bb69
Change-Id: I1099fdb75ca4dbaaf6aafb14cc4862fba7853a4e
|
2019-06-03 18:59:25 -07:00 |
|
Winson Chung
|
4f93da25ba
|
Merge "Fix regression in swiping up from lockscreen" into qt-dev am: fafe6dd571 am: 466b5dfd34
am: 72382108c8
Change-Id: I00ab71112666d40225e00fc59684edaee5ca8d91
|
2019-06-03 18:53:57 -07:00 |
|
Kevin Yao
|
c1530147f3
|
Merge "User education support on disambiguation dialog" into qt-dev am: 327751f18f am: ece8f00c18
am: 712d5fd747
Change-Id: Ie9f224843a0f3e6778172817cfcb2c5e3b0d2109
|
2019-06-03 18:52:23 -07:00 |
|
Kevin Yao
|
c64996bb69
|
Merge "User education support on disambiguation dialog" into qt-dev am: 327751f18f
am: 0d2970d912
Change-Id: I0f767ad91d0eaa7c11c14e752ba93a5c04e8cdce
|
2019-06-03 18:50:33 -07:00 |
|
Winson Chung
|
a5922dfe27
|
Merge "Fix regression in swiping up from lockscreen" into qt-dev am: fafe6dd571 am: fcf6e8c60c
am: 5c2b8d2f2d
Change-Id: Ib7c22ab5da9cd58531547fc308c37067a220adc9
|
2019-06-03 18:49:00 -07:00 |
|
Winson Chung
|
72382108c8
|
Merge "Fix regression in swiping up from lockscreen" into qt-dev am: fafe6dd571
am: 466b5dfd34
Change-Id: I426797045b7df7fce752bd2128b1c051768d66d8
|
2019-06-03 18:48:23 -07:00 |
|
Kevin Yao
|
712d5fd747
|
Merge "User education support on disambiguation dialog" into qt-dev am: 327751f18f
am: ece8f00c18
Change-Id: I99e41bc1cdd3a25e4884ba7ed7e77ab6bd7cf14e
|
2019-06-03 18:43:39 -07:00 |
|
Winson Chung
|
5c2b8d2f2d
|
Merge "Fix regression in swiping up from lockscreen" into qt-dev am: fafe6dd571
am: fcf6e8c60c
Change-Id: I36a0d156de141071a2b849a92182697968cc5852
|
2019-06-03 18:42:17 -07:00 |
|
Kevin Yao
|
0d2970d912
|
Merge "User education support on disambiguation dialog" into qt-dev
am: 327751f18f
Change-Id: I0ab37bd7b5cf4b00df4dc70d35a1387e3f348680
|
2019-06-03 18:40:43 -07:00 |
|
Kevin Yao
|
ece8f00c18
|
Merge "User education support on disambiguation dialog" into qt-dev
am: 327751f18f
Change-Id: I10d527a237fa2c47d6bef193de8aa194f391c74b
|
2019-06-03 18:40:08 -07:00 |
|
Winson Chung
|
466b5dfd34
|
Merge "Fix regression in swiping up from lockscreen" into qt-dev
am: fafe6dd571
Change-Id: Ie6a8a8983c4fa9340309353670f7940b12f2c18b
|
2019-06-03 18:38:38 -07:00 |
|
Winson Chung
|
fcf6e8c60c
|
Merge "Fix regression in swiping up from lockscreen" into qt-dev
am: fafe6dd571
Change-Id: Ibba3f3e5164ca64fa85a3ec71ce9299c35376789
|
2019-06-03 18:38:07 -07:00 |
|
Kevin Yao
|
327751f18f
|
Merge "User education support on disambiguation dialog" into qt-dev
|
2019-06-04 01:29:21 +00:00 |
|
TreeHugger Robot
|
fafe6dd571
|
Merge "Fix regression in swiping up from lockscreen" into qt-dev
|
2019-06-04 01:20:51 +00:00 |
|
Jean-Michel Trivi
|
2db9d3cf4f
|
Merge "Merge "AudioService: hearing aid volume updates for voice vs media" into qt-dev am: ed97f7b762 am: 1b432c135f" into qt-r1-dev-plus-aosp
am: a3d4c1769c
Change-Id: If05025b79f128bf21395a1c59e2a7540cc4093db
|
2019-06-03 18:12:51 -07:00 |
|
Jean-Michel Trivi
|
c7927f4f93
|
Merge "AudioService: hearing aid volume updates for voice vs media" into qt-dev am: ed97f7b762 am: a44e2ba887
am: e1bd0ebdb7
Change-Id: Ibb2cb082c4226861bf43b0e4ddb9cc9b26fadc1b
|
2019-06-03 18:10:26 -07:00 |
|
Android Build Merger (Role)
|
a3d4c1769c
|
Merge "Merge "AudioService: hearing aid volume updates for voice vs media" into qt-dev am: ed97f7b762 am: 1b432c135f" into qt-r1-dev-plus-aosp
|
2019-06-04 01:05:41 +00:00 |
|
Jean-Michel Trivi
|
1fee17e4f2
|
Merge "AudioService: hearing aid volume updates for voice vs media" into qt-dev am: ed97f7b762
am: 1b432c135f
Change-Id: I7a2655a661d5bd365fb2a008b943ccda075f00dd
|
2019-06-03 18:05:02 -07:00 |
|