Yiwei Zhang
25042913bb
Merge "Game Driver: Process sphal libraries in GraphicsEnvironment" into qt-dev am: c0c88c6ed3
...
am: 5e7b959fd6
Change-Id: Ie348d1a8e905af56821ca9bc6dd7853530e9087c
2019-06-13 19:26:23 -07:00
Hui Yu
c41053d237
Merge "Fix the missing longwake finish event problem." into qt-dev am: eb5532eac8
...
am: 9561558259
Change-Id: I866e47039f300e3064e3baf8818aa3426385c927
2019-06-13 19:22:56 -07:00
John Reck
6dd08cba1c
Merge "Fix buffer overflow in Trace's JNI layer" into qt-dev am: 935a535bc6
...
am: 0785d489c2
Change-Id: Icee436d2529c99230a1f6be8f3c75d80aaad812d
2019-06-13 19:20:35 -07:00
Yiwei Zhang
06bda8d229
Merge "Game Driver: Process sphal libraries in GraphicsEnvironment" into qt-dev am: c0c88c6ed3
...
am: 74cc59e57b
Change-Id: I9c8f18cfa600f1204e95498682fd99e84e808a3e
2019-06-13 19:18:52 -07:00
Hui Yu
9b15a84247
Merge "Fix the missing longwake finish event problem." into qt-dev am: eb5532eac8
...
am: f832f61e1c
Change-Id: I33f89a30e0daccaa40c938997e984ad1099cb2a3
2019-06-13 19:16:55 -07:00
Yiwei Zhang
5e7b959fd6
Merge "Game Driver: Process sphal libraries in GraphicsEnvironment" into qt-dev
...
am: c0c88c6ed3
Change-Id: Ie4622fc2bffd73d6be9d2c3aba3bf5ac30e7c0e7
2019-06-13 19:15:01 -07:00
John Reck
2fa586b44d
Merge "Fix buffer overflow in Trace's JNI layer" into qt-dev am: 935a535bc6
...
am: c8feb89e44
Change-Id: I773bb49d5e3a3a7ec8b2a4c8bcadbdec3e58287d
2019-06-13 19:14:08 -07:00
Hui Yu
9561558259
Merge "Fix the missing longwake finish event problem." into qt-dev
...
am: eb5532eac8
Change-Id: I4f1b554cbf5f9da1b7a922ce89b77537b6be6667
2019-06-13 19:11:28 -07:00
James O'Leary
c9ae615826
Merge "Start invocation light length from 0" into qt-r1-dev
...
am: c8ff38dbc0
Change-Id: Ieec8394cf0a6cf04c03e2bf5f1ffe1bf353c20e0
2019-06-13 19:10:44 -07:00
John Reck
0785d489c2
Merge "Fix buffer overflow in Trace's JNI layer" into qt-dev
...
am: 935a535bc6
Change-Id: Ifb631607efe3e4d5ece9897851afe5153d237897
2019-06-13 19:03:59 -07:00
Yiwei Zhang
74cc59e57b
Merge "Game Driver: Process sphal libraries in GraphicsEnvironment" into qt-dev
...
am: c0c88c6ed3
Change-Id: I8306fe050ef1be06b185b0a7a3183e0c5a9bdf75
2019-06-13 18:58:31 -07:00
Hui Yu
f832f61e1c
Merge "Fix the missing longwake finish event problem." into qt-dev
...
am: eb5532eac8
Change-Id: Ie082baea99603bba6847da9cfdd959f6f5d01461
2019-06-13 18:56:06 -07:00
Android Build Merger (Role)
7757093cc0
Merge "Merge "Game Driver: add support to apply prerelease driver for all apps" into qt-dev am: 45315597ff am: 5229f699ee" into qt-r1-dev-plus-aosp
2019-06-14 01:54:37 +00:00
Yiwei Zhang
5d52b8bb9e
Merge "Game Driver: add support to apply prerelease driver for all apps" into qt-dev am: 45315597ff
...
am: 5229f699ee
Change-Id: I48de8f9d11a4975e461c9032deb58a650edf9df4
2019-06-13 18:53:20 -07:00
Taesu Lee
5ded387636
Merge "Assume successful delivery if no Message Status" am: 94deb1ca38 am: 05d08d1a1e
...
am: b17cdd14c1
Change-Id: I066fef3a3a292e1c05cbe3283678cb9ab411753e
2019-06-13 18:51:22 -07:00
John Reck
c8feb89e44
Merge "Fix buffer overflow in Trace's JNI layer" into qt-dev
...
am: 935a535bc6
Change-Id: I69adf81bea20e08ae59ee1321a2d262006059fc3
2019-06-13 18:50:32 -07:00
Ryan Savitski
4dbeadc951
[automerger skipped] Merge "userdebug: support perfetto traces as a section in incident reports" into qt-dev am: cfff472c8e
...
am: d205ee215d -s ours
am skip reason: change_id Iaaa312d2d9da73ca329807211227a8c7a049102c with SHA1 cc7d9973c6 is in history
Change-Id: I5e9d65958cf4e0dad96dc60f84cf3545702f004a
2019-06-13 18:48:02 -07:00
James O'Leary
c8ff38dbc0
Merge "Start invocation light length from 0" into qt-r1-dev
2019-06-14 01:41:03 +00:00
TreeHugger Robot
c0c88c6ed3
Merge "Game Driver: Process sphal libraries in GraphicsEnvironment" into qt-dev
2019-06-14 01:36:32 +00:00
Yiwei Zhang
31c2d89022
Merge "Game Driver: add support to apply prerelease driver for all apps" into qt-dev am: 45315597ff
...
am: 3625e21cbc
Change-Id: I7ed45f858f86147018f223bc293d6d17498fa44d
2019-06-13 18:19:33 -07:00
Yiwei Zhang
5229f699ee
Merge "Game Driver: add support to apply prerelease driver for all apps" into qt-dev
...
am: 45315597ff
Change-Id: I31910c4b2360e1639cfd9017db66acac67e55347
2019-06-13 18:18:22 -07:00
TreeHugger Robot
eb5532eac8
Merge "Fix the missing longwake finish event problem." into qt-dev
2019-06-14 01:03:34 +00:00
TreeHugger Robot
935a535bc6
Merge "Fix buffer overflow in Trace's JNI layer" into qt-dev
2019-06-14 00:36:03 +00:00
Ryan Savitski
50758fff6b
Merge "userdebug: support perfetto traces as a section in incident reports" into qt-dev am: cfff472c8e
...
am: 69b3390c9d
Change-Id: I09424d870a90c7b8f75c9dcf7d4030dc591c572b
2019-06-13 17:33:02 -07:00
Ryan Savitski
d205ee215d
Merge "userdebug: support perfetto traces as a section in incident reports" into qt-dev
...
am: cfff472c8e
Change-Id: I6e023382bd1059c0081b748029a3aa201352a8cf
2019-06-13 17:31:40 -07:00
Taesu Lee
b17cdd14c1
Merge "Assume successful delivery if no Message Status" am: 94deb1ca38
...
am: 05d08d1a1e
Change-Id: Ibf823cc8bd8353940c0d238d3a398f68fa930d86
2019-06-13 17:26:55 -07:00
Yiwei Zhang
3625e21cbc
Merge "Game Driver: add support to apply prerelease driver for all apps" into qt-dev
...
am: 45315597ff
Change-Id: I0579e94650f81720eb5309996ec5a4ff0a309d42
2019-06-13 16:53:18 -07:00
Ryan Savitski
69b3390c9d
Merge "userdebug: support perfetto traces as a section in incident reports" into qt-dev
...
am: cfff472c8e
Change-Id: I98dcfaf8b40f2715c881023d41234508e37db238
2019-06-13 16:50:58 -07:00
Taesu Lee
05d08d1a1e
Merge "Assume successful delivery if no Message Status"
...
am: 94deb1ca38
Change-Id: I106db1010a847a23f5e007c65a677bde5562f56e
2019-06-13 16:48:42 -07:00
TreeHugger Robot
45315597ff
Merge "Game Driver: add support to apply prerelease driver for all apps" into qt-dev
2019-06-13 23:44:36 +00:00
Amit Mahajan
430bc23a22
Merge "[automerger skipped] Merge changes I44dc66f9,I72ee7af9 am: cb7c0be8fb am: 6b0aed2ed7 -s ours
...
am: 413b45caf0 -s ours
am skip reason: change_id I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825 with SHA1 900aad9924 is in history
Change-Id: I49f21aaa987efd14c1f996e8c6e3260d7f17b189
2019-06-13 16:42:43 -07:00
Ryan Savitski
cfff472c8e
Merge "userdebug: support perfetto traces as a section in incident reports" into qt-dev
2019-06-13 23:42:09 +00:00
Android Build Merger (Role)
5d50fe8f01
Merge "Merge "Trace sync rt transaction applier" into qt-dev am: c6f5069668 am: 1396cc8427" into qt-r1-dev-plus-aosp
2019-06-13 23:40:44 +00:00
Jorim Jaggi
2da5602e13
Merge "Trace sync rt transaction applier" into qt-dev am: c6f5069668
...
am: 1396cc8427
Change-Id: I4c0d942b6d09366e537c22bcd20ce805425660c6
2019-06-13 16:40:00 -07:00
Jorim Jaggi
4b62805707
Merge "Trace sync rt transaction applier" into qt-dev am: c6f5069668
...
am: a8393c6b07
Change-Id: I2cecf67b623d043c80d9761ece8e24c92d098d1d
2019-06-13 16:39:15 -07:00
Treehugger Robot
94deb1ca38
Merge "Assume successful delivery if no Message Status"
2019-06-13 23:32:09 +00:00
Jorim Jaggi
a8393c6b07
Merge "Trace sync rt transaction applier" into qt-dev
...
am: c6f5069668
Change-Id: Ifdfa1389a022a396167e606287485aabf7768c76
2019-06-13 16:29:14 -07:00
Android Build Merger (Role)
413b45caf0
Merge "[automerger skipped] Merge changes I44dc66f9,I72ee7af9 am: cb7c0be8fb am: 6b0aed2ed7 -s ours am skip reason: change_id I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825 with SHA1 900aad9924 is in history" into qt-dev-plus-aosp
2019-06-13 23:28:08 +00:00
Amit Mahajan
78675d0b4a
[automerger skipped] Merge changes I44dc66f9,I72ee7af9 am: cb7c0be8fb
...
am: 6b0aed2ed7 -s ours
am skip reason: change_id I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825 with SHA1 900aad9924 is in history
Change-Id: I860a86725720bfee30b15415b9a7b43c1b620862
2019-06-13 16:27:21 -07:00
Jorim Jaggi
1396cc8427
Merge "Trace sync rt transaction applier" into qt-dev
...
am: c6f5069668
Change-Id: I647274e9e4290cd4afe867549ef72b879021b244
2019-06-13 16:26:35 -07:00
Amit Mahajan
6b0aed2ed7
Merge changes I44dc66f9,I72ee7af9
...
am: cb7c0be8fb
Change-Id: I6d92a16455441f38a2f63c553ce28c9ebdbf0b15
2019-06-13 16:16:06 -07:00
TreeHugger Robot
c6f5069668
Merge "Trace sync rt transaction applier" into qt-dev
2019-06-13 23:12:00 +00:00
Amit Mahajan
cb7c0be8fb
Merge changes I44dc66f9,I72ee7af9
...
* changes:
Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()
Fix the default sub id returned by SmsManager.
2019-06-13 22:47:13 +00:00
Android Build Merger (Role)
a4be119ab0
Merge "Merge "Also dispatching that we finished waking up after booting" into qt-dev am: 0a6355e4dc am: df64ca93bf" into qt-r1-dev-plus-aosp
2019-06-13 22:43:26 +00:00
Selim Cinek
809d4969a3
Merge "Also dispatching that we finished waking up after booting" into qt-dev am: 0a6355e4dc
...
am: df64ca93bf
Change-Id: Ia3da445e7d5a10b9c3b8451aa323b6a7e0786453
2019-06-13 15:42:42 -07:00
Selim Cinek
4099cba01e
Merge "Also dispatching that we finished waking up after booting" into qt-dev am: 0a6355e4dc
...
am: 79e853195b
Change-Id: I053581956764a95284210a7809ed27c4883d78ac
2019-06-13 15:41:42 -07:00
Android Build Merger (Role)
4cd94a5828
Merge "Merge "Bump up contrast of NotificationInfo.Secondary" into qt-dev am: 19d096e712 am: 4156be70a4" into qt-r1-dev-plus-aosp
2019-06-13 22:40:17 +00:00
Evan Laird
9e2ae5ff2a
Merge "Bump up contrast of NotificationInfo.Secondary" into qt-dev am: 19d096e712
...
am: 4156be70a4
Change-Id: I0e405c523d0511d24bbe694c0bba227c77b89c10
2019-06-13 15:39:24 -07:00
Evan Laird
678b8c7c38
Merge "Bump up contrast of NotificationInfo.Secondary" into qt-dev am: 19d096e712
...
am: 47df423280
Change-Id: I46e9aa1fbb280120c39440d9e554119cb520340d
2019-06-13 15:39:19 -07:00
Selim Cinek
79e853195b
Merge "Also dispatching that we finished waking up after booting" into qt-dev
...
am: 0a6355e4dc
Change-Id: Ib04ceb15e4006ba0fff0f064a215fbf7e2ede659
2019-06-13 15:24:35 -07:00