Lucas Dupin
eac3ebc233
Merge "Merge "Lock screen string change" into qt-r1-dev am: ea82651abc" into qt-r1-dev-plus-aosp
...
am: fb01cdee5b
2019-06-05 16:22:36 -07:00
Joshua Mccloskey
812cac2135
Merge "Merge "Fixed talkback issue" into qt-r1-dev am: 7f22b4d5be" into qt-r1-dev-plus-aosp
...
am: 2b398bd6da
2019-06-05 16:21:46 -07:00
Lucas Dupin
6d4507e1b1
Merge "Merge "Fix issue where panel opacity could be wrong" into qt-dev am: 30e9b45cd9 am: 3db3383e99" into qt-r1-dev-plus-aosp
...
am: 05d8c22c33
2019-06-05 16:20:49 -07:00
Alex Salo
e09ccb00e0
Merge "Merge "Don't call ActivityManagerService on main thread" into qt-dev am: 9a01bb4280 am: 545cc77897" into qt-r1-dev-plus-aosp
...
am: e8fdc6472c
2019-06-05 16:19:55 -07:00
Mathieu Chartier
343bd9ef48
Merge "Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev am: 652b445c07 am: 63b02d86ae" into qt-r1-dev-plus-aosp
...
am: 3fd63bf2cc
2019-06-05 16:18:29 -07:00
Bill Yi
bf0912f084
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0906e02aa3 -s ours am: 31d62741d2 -s ours
...
am: f5d4b93cdf
2019-06-05 16:17:31 -07:00
Bill Yi
38693c6f02
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 452be4963c -s ours am: fb900c8432 -s ours
...
am: 55765bc34a
2019-06-05 16:16:43 -07:00
Tracy Zhou
31d40dd5c0
Merge "Merge "Fix the logic of canceling previous scheduled fade in animation." into qt-dev am: 289583ec1a am: d1f08c582a" into qt-r1-dev-plus-aosp
...
am: bcbb58977c
2019-06-05 16:15:20 -07:00
Hui Yu
b1564f50f7
Merge "Merge "Only set mStartClockTime when device is fully charged." into qt-dev am: 28d28a4ee5 am: c1dceabb36" into qt-r1-dev-plus-aosp
...
am: 0f2f7a3c91
2019-06-05 16:14:24 -07:00
David Sehr
58313492fd
Merge "[automerger skipped] Merge "Add system option to disable lock profiling" into qt-dev am: 10d9320c3a am: 883b12f4a0 -s ours
...
am: 164a2c75280d1014c9e3
2019-06-05 16:13:33 -07:00
Joe Onorato
ca6b608cff
Merge "Merge "Do not include specific_mention sections in bugreports either." into qt-dev am: da7f7e0a32 am: 758800ef58" into qt-r1-dev-plus-aosp
...
am: 8aa3700f38
2019-06-05 16:02:46 -07:00
Winson Chung
6f7193f0d6
Merge "Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev am: c8120d6d6a am: 8533a4cc62" into qt-r1-dev-plus-aosp
...
am: 5ebd857a49
2019-06-05 16:01:03 -07:00
Jovana Knezevic
158beabe1e
Merge "Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev am: e45e09fcee am: 7e80654f56" into qt-r1-dev-plus-aosp
...
am: c7fc462eb4
2019-06-05 15:59:00 -07:00
Kevin Chyn
658fe4a003
Merge "Merge "Partial revert of ag/7508382 to retain back button responsiveness in BiomtericPrompt" into qt-dev am: 4024769fd1 am: a8040cce98" into qt-r1-dev-plus-aosp
...
am: bdf9b7018e
2019-06-05 15:57:11 -07:00
Mady Mellor
01f9115864
Merge "Post finishing after transition in onBackPressed" into qt-dev am: 57854d3b90 am: d562e7511b
...
am: 2a9c25564a
2019-06-05 15:55:09 -07:00
Wale Ogunwale
7216476234
Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev am: 2aa255a746 am: ccbe8239ae
...
am: e2d54d719c
2019-06-05 15:53:35 -07:00
Matt Casey
1fe9d62b4b
Merge "Rendering fixes for assist handles." into qt-dev am: 075baa2e9b am: 1bdee403fc
...
am: f56ab49a6c
2019-06-05 15:51:51 -07:00
Lorenzo Colitti
45615cece6
Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev am: e2fb127e41 am: b1d32ef751
...
am: 2765cfb5e6
2019-06-05 15:50:03 -07:00
Android Build Merger (Role)
921310eed5
Merge "Merge "Fix slow query log." into qt-dev am: dee07f5d7f am: e95419371a am: 1f34785cf4"
2019-06-05 22:49:06 +00:00
TreeHugger Robot
fa683ea249
Merge "Add shell command to toggle DND"
2019-06-05 22:48:57 +00:00
Makoto Onuki
75d31212c3
Merge "Fix slow query log." into qt-dev am: dee07f5d7f am: e95419371a
...
am: 1f34785cf4
2019-06-05 15:48:17 -07:00
Kevin Chyn
e61a0cd2e5
Merge "Use real gatekeeper HAT for resetting lockout" into qt-r1-dev am: fbd90d3dec
...
am: 1cc9bbbe3a
2019-06-05 15:46:36 -07:00
Govinda Wasserman
d5f1478940
Merge "Fixes timestamp passed to the Assistant" into qt-r1-dev am: 0ce43fa68c
...
am: 77791e0ce3
2019-06-05 15:44:33 -07:00
Robert Snoeberger
3c57979674
Merge "Prevent clock-lock overlap with pulsing on AOD." into qt-r1-dev am: 30a416fdea
...
am: 32de62d8cf
2019-06-05 15:42:46 -07:00
Android Build Merger (Role)
fb01cdee5b
Merge "Merge "Lock screen string change" into qt-r1-dev am: ea82651abc" into qt-r1-dev-plus-aosp
2019-06-05 22:41:37 +00:00
Hongyi Zhang
48ecd4a2bb
Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev am: a1d0453641 am: 01d0acfed0
...
am: f0d95b97ba
2019-06-05 15:41:14 -07:00
Lucas Dupin
efa747d1e3
Merge "Lock screen string change" into qt-r1-dev
...
am: ea82651abc
2019-06-05 15:40:47 -07:00
Android Build Merger (Role)
2b398bd6da
Merge "Merge "Fixed talkback issue" into qt-r1-dev am: 7f22b4d5be" into qt-r1-dev-plus-aosp
2019-06-05 22:40:40 +00:00
Joshua Mccloskey
be8c898737
Merge "Fixed talkback issue" into qt-r1-dev
...
am: 7f22b4d5be
2019-06-05 15:39:56 -07:00
Android Build Merger (Role)
05d8c22c33
Merge "Merge "Fix issue where panel opacity could be wrong" into qt-dev am: 30e9b45cd9 am: 3db3383e99" into qt-r1-dev-plus-aosp
2019-06-05 22:39:39 +00:00
Victor Hsieh
5064495283
Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev am: 4fd5870662 am: 00e482d84e
...
am: 336c1a4596
2019-06-05 15:39:35 -07:00
Lucas Dupin
05ff5a14de
Merge "Fix issue where panel opacity could be wrong" into qt-dev am: 30e9b45cd9
...
am: 3db3383e99
2019-06-05 15:38:51 -07:00
Android Build Merger (Role)
e8fdc6472c
Merge "Merge "Don't call ActivityManagerService on main thread" into qt-dev am: 9a01bb4280 am: 545cc77897" into qt-r1-dev-plus-aosp
2019-06-05 22:38:46 +00:00
Alex Salo
c0f24f5007
Merge "Don't call ActivityManagerService on main thread" into qt-dev am: 9a01bb4280
...
am: 545cc77897
2019-06-05 15:38:04 -07:00
Android Build Merger (Role)
3fd63bf2cc
Merge "Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev am: 652b445c07 am: 63b02d86ae" into qt-r1-dev-plus-aosp
2019-06-05 22:37:59 +00:00
Lucas Dupin
453177e631
Merge "Disable bypass if there aren't enrolled faces" into qt-r1-dev am: 9369357e1d
...
am: 883581f176
2019-06-05 15:37:51 -07:00
Mathieu Chartier
d405bc5af4
Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev am: 652b445c07
...
am: 63b02d86ae
2019-06-05 15:37:21 -07:00
Android Build Merger (Role)
f5d4b93cdf
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0906e02aa3 -s ours am: 31d62741d2 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-06-05 22:37:16 +00:00
Bill Yi
2e43d74d2f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0906e02aa3 -s ours
...
am: 31d62741d2
2019-06-05 15:36:24 -07:00
Android Build Merger (Role)
55765bc34a
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 452be4963c -s ours am: fb900c8432 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-06-05 22:36:19 +00:00
Bill Yi
2ba15a932f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 452be4963c -s ours
...
am: fb900c8432
2019-06-05 15:35:36 -07:00
Android Build Merger (Role)
bcbb58977c
Merge "Merge "Fix the logic of canceling previous scheduled fade in animation." into qt-dev am: 289583ec1a am: d1f08c582a" into qt-r1-dev-plus-aosp
2019-06-05 22:35:33 +00:00
Tracy Zhou
30e87713f6
Merge "Fix the logic of canceling previous scheduled fade in animation." into qt-dev am: 289583ec1a
...
am: d1f08c582a
2019-06-05 15:34:47 -07:00
Android Build Merger (Role)
0f2f7a3c91
Merge "Merge "Only set mStartClockTime when device is fully charged." into qt-dev am: 28d28a4ee5 am: c1dceabb36" into qt-r1-dev-plus-aosp
2019-06-05 22:34:41 +00:00
Hui Yu
d74aa7dab1
Merge "Only set mStartClockTime when device is fully charged." into qt-dev am: 28d28a4ee5
...
am: c1dceabb36
2019-06-05 15:33:54 -07:00
Android Build Merger (Role)
164a2c7528
Merge "[automerger skipped] Merge "Add system option to disable lock profiling" into qt-dev am: 10d9320c3a am: 883b12f4a0 -s ours am skip reason: change_id Ida5f83e626c82266de69b13dc2def0477cc87b0f with SHA1 0d1014c9e3 is in history" into qt-r1-dev-plus-aosp
2019-06-05 22:33:47 +00:00
Android Build Merger (Role)
8aa3700f38
Merge "Merge "Do not include specific_mention sections in bugreports either." into qt-dev am: da7f7e0a32 am: 758800ef58" into qt-r1-dev-plus-aosp
2019-06-05 22:33:28 +00:00
David Sehr
8dbb0ea596
[automerger skipped] Merge "Add system option to disable lock profiling" into qt-dev am: 10d9320c3a
...
am: 883b12f4a00d1014c9e3
2019-06-05 15:32:57 -07:00
Joe Onorato
1386650a59
Merge "Do not include specific_mention sections in bugreports either." into qt-dev am: da7f7e0a32
...
am: 758800ef58
2019-06-05 15:32:51 -07:00
Android Build Merger (Role)
5ebd857a49
Merge "Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev am: c8120d6d6a am: 8533a4cc62" into qt-r1-dev-plus-aosp
2019-06-05 22:32:45 +00:00
