Rob Carr
dd41789512
Merge "Careful with screenshots containing secure layers!" into qt-dev am: f8f5f0290e
...
am: cea68c7904
2019-04-08 21:50:22 -07:00
Hai Shalom
14d3745d6f
Merge "[SettingsLib] Fix WPA2 security type string" into qt-dev am: 45e2c22d7e
...
am: 128b0f140c
2019-04-08 21:43:57 -07:00
Amin Shaikh
199c8ac8e1
Merge "Fix StatusBarWifiView applying the wrong wifi icon" into qt-dev am: 7c5b1dbb7a
...
am: 4939068dfc
2019-04-08 21:38:51 -07:00
Adam He
b34d24a41c
Merge "Document runtime exception being thrown on afs.getFillEvents()." into qt-dev am: 351b1e8b60
...
am: b59231b0b5
2019-04-08 21:33:40 -07:00
Howard Ro
590d90094a
Merge "Remove Notification atom" into qt-dev am: 20e8812650
...
am: e163ec8820
2019-04-08 21:20:16 -07:00
TreeHugger Robot
019235afa0
Merge "p2p: unit tests for WifiP2pGroup"
2019-04-09 03:42:28 +00:00
Amin Shaikh
696381a33a
Merge "Fix brightness icon in theme pack." into qt-dev am: dac5aa6df2
...
am: 22d9ef483b
2019-04-08 19:56:33 -07:00
Rob Carr
cea68c7904
Merge "Careful with screenshots containing secure layers!" into qt-dev
...
am: f8f5f0290e
2019-04-08 19:52:49 -07:00
Hai Shalom
128b0f140c
Merge "[SettingsLib] Fix WPA2 security type string" into qt-dev
...
am: 45e2c22d7e
2019-04-08 19:45:26 -07:00
Amin Shaikh
4939068dfc
Merge "Fix StatusBarWifiView applying the wrong wifi icon" into qt-dev
...
am: 7c5b1dbb7a
2019-04-08 19:40:28 -07:00
Adam He
b59231b0b5
Merge "Document runtime exception being thrown on afs.getFillEvents()." into qt-dev
...
am: 351b1e8b60
2019-04-08 19:33:06 -07:00
Howard Ro
e163ec8820
Merge "Remove Notification atom" into qt-dev
...
am: 20e8812650
2019-04-08 19:20:32 -07:00
Jimmy Chen
ed4fc9abf7
p2p: unit tests for WifiP2pGroup
...
Bug: 130138124
Test: atest FrameworksWifiApiTests
Change-Id: I40818ac3ab02facecb0976cf4cd5ab0ca18d84d5
2019-04-09 01:58:46 +00:00
Jimmy Chen
a330174d8d
p2p: unit tests for WifiP2pGroupList
...
Bug: 130138124
Test: atest FrameworksWifiApiTests
Change-Id: I51f6fb88983ce8d0f45139241954ca1de1553fcf
2019-04-09 01:58:41 +00:00
Android Build Merger (Role)
f0b622a3ec
Merge "Merge "Pass runMax = 1 to stop unnecessary itemization" into qt-dev am: c8723d6ca7 am: 79d2ef76a8"
2019-04-09 01:50:23 +00:00
Seigo Nonaka
cdf7f685a2
Merge "Pass runMax = 1 to stop unnecessary itemization" into qt-dev am: c8723d6ca7
...
am: 79d2ef76a8
2019-04-08 18:49:09 -07:00
Android Build Merger (Role)
4694ec4486
Merge "Merge "Fixing edge swipe region not updating on device rotation" into qt-dev am: 44519220b6 am: e5f8230f59"
2019-04-09 01:43:34 +00:00
Sunny Goyal
0637fdac7d
Merge "Fixing edge swipe region not updating on device rotation" into qt-dev am: 44519220b6
...
am: e5f8230f59
2019-04-08 18:43:10 -07:00
Android Build Merger (Role)
330d80842d
Merge "Merge changes from topic "tdscdma-rscp" am: 891f195a23 am: 6384b9405f am: 2c383dce26"
2019-04-09 01:38:36 +00:00
Nathan Harold
45eb0c647a
Merge changes from topic "tdscdma-rscp" am: 891f195a23 am: 6384b9405f
...
am: 2c383dce26
2019-04-08 18:37:04 -07:00
Android Build Merger (Role)
60a8eb442a
Merge "[automerger skipped] Merge changes from topics "126864501", "129296702" am: 9f80ec1d51 am: 04946bdad4 -s ours am: f087f1b848 -s ours am skip reason: change_id I3d50fb30980b5e2d2240bd186fb15c7f2a7c21ab with SHA1 6abe81ff23 is in history"
2019-04-09 01:31:07 +00:00
Xiangyu/Malcolm Chen
ece8d1589a
[automerger skipped] Merge changes from topics "126864501", "129296702" am: 9f80ec1d51 am: 04946bdad4 -s ours
...
am: f087f1b8486abe81ff23
2019-04-08 18:25:25 -07:00
Android Build Merger (Role)
24f796e8ad
Merge "[automerger skipped] Merge "Fixed incorrect service state populated" am: 5f8b1bfe66 am: 3690c6d927 -s ours am: c02c189aec -s ours am skip reason: change_id I7fab7090c22390914af024c44bffd643c13f33e5 with SHA1 9302618da6 is in history"
2019-04-09 01:19:33 +00:00
Jack Yu
c6517b3ef5
[automerger skipped] Merge "Fixed incorrect service state populated" am: 5f8b1bfe66 am: 3690c6d927 -s ours
...
am: c02c189aec9302618da6
2019-04-08 18:18:51 -07:00
Android Build Merger (Role)
67b855826e
Merge "Merge "More description on logBinaryPushStateChanged" into qt-dev am: 2470fdb507 am: effe92f289"
2019-04-09 01:13:00 +00:00
Howard Ro
a34a297d6c
Merge "More description on logBinaryPushStateChanged" into qt-dev am: 2470fdb507
...
am: effe92f289
2019-04-08 18:12:29 -07:00
TreeHugger Robot
d6ebdab096
Merge "Remove Obsolete Comment"
2019-04-09 01:11:36 +00:00
Ryan Mitchell
9b44c5410a
Merge "Allow merging of resources with the same overlayable" into qt-dev am: 636f9ae0c2
...
am: c8b5afc692
2019-04-08 18:07:26 -07:00
Tyler Gunn
7877ecfeaa
Merge "Add @hide API to get the phone account handle for a subId." into qt-dev am: beeb456338
...
am: 6fc4da9785
2019-04-08 17:51:22 -07:00
Bryan Mawhinney
589c2eeb29
Merge "Make colorPrimary darker in Theme.DeviceDefault.Settings at night" into qt-dev am: e5b5f30fbe
...
am: 1e7e4324e3
2019-04-08 17:46:13 -07:00
Rob Carr
f8f5f0290e
Merge "Careful with screenshots containing secure layers!" into qt-dev
2019-04-09 00:45:22 +00:00
Bryan Mawhinney
17a82403c1
Merge "Allow themeing of icon in SuspendedAppActivity" into qt-dev am: 353c5cc16a
...
am: 066afb6c98
2019-04-08 17:41:00 -07:00
Nathan Harold
5829a1070a
Merge "Revert a bad merge from ag/6938423" into qt-dev-plus-aosp
...
am: 039a58dffb
2019-04-08 17:36:00 -07:00
Bill Yi
ded8fe9246
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 568b02ee00 -s ours
...
am: 5e7a4efa25
2019-04-08 17:31:03 -07:00
Fabian Kozynski
c506a5fc94
Merge "Visual changes to QS header" into qt-dev am: e19335a443
...
am: 5e59d60b3d
2019-04-08 17:30:25 -07:00
TreeHugger Robot
45e2c22d7e
Merge "[SettingsLib] Fix WPA2 security type string" into qt-dev
2019-04-09 00:26:44 +00:00
sqian
d853f68858
[automerger skipped] Merge "Fix documentation of CallRedirectionService" am: 820a7b5144 am: 3c9e9d1939 -s ours
...
am: 2881e89cee87833ee867
2019-04-08 17:23:21 -07:00
TreeHugger Robot
7c5b1dbb7a
Merge "Fix StatusBarWifiView applying the wrong wifi icon" into qt-dev
2019-04-09 00:19:24 +00:00
TreeHugger Robot
351b1e8b60
Merge "Document runtime exception being thrown on afs.getFillEvents()." into qt-dev
2019-04-09 00:11:36 +00:00
TreeHugger Robot
20e8812650
Merge "Remove Notification atom" into qt-dev
2019-04-09 00:04:04 +00:00
Amin Shaikh
22d9ef483b
Merge "Fix brightness icon in theme pack." into qt-dev
...
am: dac5aa6df2
2019-04-08 16:50:18 -07:00
Seigo Nonaka
79d2ef76a8
Merge "Pass runMax = 1 to stop unnecessary itemization" into qt-dev
...
am: c8723d6ca7
2019-04-08 16:43:46 -07:00
Remi NGUYEN VAN
1b667cf1d5
Merge "[automerger skipped] Merge "Add FrameworksNetTests dependency on libcgrouprc" am: 3729b26f8a -s ours am: 204ef43f56 -s ours
...
am: 1704d678ff061cec7755
2019-04-08 16:40:42 -07:00
Sunny Goyal
e5f8230f59
Merge "Fixing edge swipe region not updating on device rotation" into qt-dev
...
am: 44519220b6
2019-04-08 16:38:02 -07:00
Kyeongkab.Nam
4a57bab027
Merge "Merge "Fix exception of unregisterCallback when callback is not registered" am: 43b75cad9e am: d526de2ca2" into qt-dev-plus-aosp
...
am: 1b846b4604
2019-04-08 16:32:17 -07:00
Nathan Harold
2c383dce26
Merge changes from topic "tdscdma-rscp" am: 891f195a23
...
am: 6384b9405f
2019-04-08 16:28:35 -07:00
TreeHugger Robot
dac5aa6df2
Merge "Fix brightness icon in theme pack." into qt-dev
2019-04-08 23:26:19 +00:00
Xiangyu/Malcolm Chen
f087f1b848
[automerger skipped] Merge changes from topics "126864501", "129296702" am: 9f80ec1d51
...
am: 04946bdad46abe81ff23
2019-04-08 16:21:35 -07:00
TreeHugger Robot
c8723d6ca7
Merge "Pass runMax = 1 to stop unnecessary itemization" into qt-dev
2019-04-08 23:18:59 +00:00
Lucas Lin
d135418cbc
Merge "Merge "Prevent SIGN_IN notification pop up several times" am: 83152b1e5f am: d454c3c276" into qt-dev-plus-aosp
...
am: b1a0373791
2019-04-08 16:18:14 -07:00
