Commit Graph

3718 Commits

Author SHA1 Message Date
Xin Li
cda94f4bf1 [automerger skipped] Mark stage branch as merged in qt-dev. am: 5775b852a7 -s ours am: 1c04d967aa -s ours
am: cc92930e29 -s ours
am skip reason: change_id Ibcbd7833bec952d69841abbea827affc202941b6 with SHA1 ca767c6852 is in history

Change-Id: Ibbc4e0b751f0636a976b9f35d908fcec4ec328f9
2019-09-08 18:53:20 -07:00
Xin Li
cc92930e29 [automerger skipped] Mark stage branch as merged in qt-dev. am: 5775b852a7 -s ours
am: 1c04d967aa -s ours
am skip reason: change_id Ibcbd7833bec952d69841abbea827affc202941b6 with SHA1 ca767c6852 is in history

Change-Id: I3930fccbb3b38c91c3f23e4a8d5a9c9bf56d7464
2019-09-08 18:35:49 -07:00
Xin Li
02eb568b35 [automerger skipped] Mark stage branch as merged in qt-dev. am: 5775b852a7 -s ours am: 1c04d967aa -s ours
am: 525d2c8ccf -s ours
am skip reason: change_id Ibcbd7833bec952d69841abbea827affc202941b6 with SHA1 ca767c6852 is in history

Change-Id: Idc75529282a8f621473d73f6c52a142f7cb01759
2019-09-07 18:37:30 -07:00
Xin Li
1c04d967aa [automerger skipped] Mark stage branch as merged in qt-dev.
am: 5775b852a7 -s ours
am skip reason: change_id Ibcbd7833bec952d69841abbea827affc202941b6 with SHA1 ca767c6852 is in history

Change-Id: If270b3f6f9e197d0987ba457ad280042ff50f9ab
2019-09-06 14:55:34 -07:00
Xin Li
5775b852a7 Mark stage branch as merged in qt-dev.
Bug: 139373164
Merged-In: Ibcbd7833bec952d69841abbea827affc202941b6
Change-Id: I9b94f32253ac60194120f1299e6ae213d063977c
2019-09-06 13:41:14 -07:00
Xin Li
22d49c0644 Prepare for Android 10 Test Suite R2. 2019-09-06 10:33:42 -07:00
Xin Li
710c96d876 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 409c0dd705 -s ours am: e89f62e446
am: d00be03300

Change-Id: I327521e376846cd573726289469ce2a87b17a1b5
2019-09-05 12:05:50 -07:00
Xin Li
d00be03300 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 409c0dd705 -s ours
am: e89f62e446

Change-Id: I408d0d9bdb1c13599e8e6ef3c5d319bb7157c653
2019-09-05 11:46:49 -07:00
Xin Li
e89f62e446 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: 409c0dd705 -s ours
am skip reason: subject contains skip directive

Change-Id: I85a7864b8decff98e61982550d187229ee5ee7e4
2019-09-05 11:22:49 -07:00
Xin Li
409c0dd705 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:35 +00:00
Xin Li
ada8c2f0b5 DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: Ifd3b99660fd3d2bf4b00dad4d30a7bdbfa35f0fc
2019-09-04 13:32:52 -07:00
Remi NGUYEN VAN
e8c6850fcf Merge "[automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca -s ours am: 26e815023f -s ours
am: 1d25609428 -s ours
am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history

Change-Id: Ie3f82a51ce529387e025f7322d2f7c746f4ad12c
2019-08-28 20:58:54 -07:00
Remi NGUYEN VAN
0bf40755c3 [automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca am: 09f277d4d8 -s ours
am: 446037544b -s ours
am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history

Change-Id: I320a0a54a5220c69691fb6e5cec673b7b8769994
2019-08-28 20:56:39 -07:00
Android Build Merger (Role)
1d25609428 Merge "[automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca -s ours am: 26e815023f -s ours am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history" into qt-r1-dev-plus-aosp 2019-08-29 03:51:02 +00:00
Remi NGUYEN VAN
7db79fe5e6 [automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca -s ours
am: 26e815023f -s ours
am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history

Change-Id: I05aecfee12cd4395732ac8c8de8d6e465b897edc
2019-08-28 20:50:40 -07:00
Remi NGUYEN VAN
446037544b [automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca
am: 09f277d4d8 -s ours
am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history

Change-Id: I7dd987e4099be7b2ea8b64495bf011f4e6c09513
2019-08-28 20:50:38 -07:00
Remi NGUYEN VAN
26e815023f [automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev
am: fd409edeca -s ours
am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history

Change-Id: I8e124374d711efc51b752c14f8a0ee524d3fb53e
2019-08-28 20:38:57 -07:00
Remi NGUYEN VAN
09f277d4d8 Merge "Add test for WifiInfo#getFrequency()" into qt-dev
am: fd409edeca

Change-Id: Iae0f61f999c113546eb425e26db5d4d4c0c1a51c
2019-08-28 20:35:43 -07:00
TreeHugger Robot
fd409edeca Merge "Add test for WifiInfo#getFrequency()" into qt-dev 2019-08-29 03:17:58 +00:00
Chalard Jean
e5875307f6 Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 -s ours am: 97c35de59a -s ours am: 37c92ec10c -s ours am: df298b6c9f -s ours
am: 911079a493 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I085af9922f33751e647899dd669897dc07d750e1
2019-08-28 19:37:23 -07:00
markchien
5af794bd45 Merge "Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: c347654003 -s ours am: 0cfcb1a472 -s ours am: ddbd12377c -s ours am: dad9c8a980 -s ours
am: 718f123cfc -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I627dde8b6b987ab571a0521a64b3960b473ea02d
2019-08-28 19:35:31 -07:00
Chalard Jean
911079a493 Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 -s ours am: 97c35de59a -s ours am: 37c92ec10c -s ours
am: df298b6c9f -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I3371b4d2c3c5adf4e73fccf101b544759ce07639
2019-08-28 18:46:18 -07:00
markchien
718f123cfc Merge "Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: c347654003 -s ours am: 0cfcb1a472 -s ours am: ddbd12377c -s ours
am: dad9c8a980 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I3eef4d82eb1426061122ec3dba410e38ae37c349
2019-08-28 18:44:19 -07:00
markchien
781ab3fbdf Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours am: ddce521efa -s ours am: 8fe93b6bda -s ours am: f2e8130635 -s ours
am: 7526bf0f92 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Ib29a4bbef7c5c4dde43abd0b7ebce12c8aea52a1
2019-08-28 18:09:19 -07:00
markchien
7526bf0f92 Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours am: ddce521efa -s ours am: 8fe93b6bda -s ours
am: f2e8130635 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Ie2500561329bba3cab6b6bab5851d080b0170b97
2019-08-28 17:33:23 -07:00
markchien
9f4a5995a2 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 7ff168c7a1 -s ours am: 07e500dd00 -s ours am: 10d149e4bc -s ours
am: 0cb9eae765 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I024a87b3f96d7bee5cab27cac93b9028c1e18241
2019-08-28 17:31:36 -07:00
Chalard Jean
df298b6c9f Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 -s ours am: 97c35de59a -s ours
am: 37c92ec10c -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I3fe3275c1145789b9b3a4e0ce9db26c97ca479c4
2019-08-28 17:27:13 -07:00
markchien
dad9c8a980 Merge "Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: c347654003 -s ours am: 0cfcb1a472 -s ours
am: ddbd12377c -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I3ccc63a60e9fa465f391b1378b6b7be0c4749286
2019-08-28 17:25:17 -07:00
markchien
0cb9eae765 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 7ff168c7a1 -s ours am: 07e500dd00 -s ours
am: 10d149e4bc -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: Ia21904b4bcd6d02f516416fdeb712082735941be
2019-08-28 15:25:00 -07:00
Chalard Jean
37c92ec10c Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 -s ours
am: 97c35de59a -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I649b7cd056f818394e1887da217fed735c1809e3
2019-08-28 15:12:44 -07:00
markchien
ddbd12377c Merge "Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: c347654003 -s ours
am: 0cfcb1a472 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I10deed57736172e6e54abcb032ad27b8caa0295b
2019-08-28 15:10:41 -07:00
markchien
f2e8130635 Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours am: ddce521efa -s ours
am: 8fe93b6bda -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I4fad6af42f1e70e940729e6463e762cb197b6483
2019-08-28 15:08:22 -07:00
markchien
10d149e4bc Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 7ff168c7a1 -s ours
am: 07e500dd00 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: Id67a80017c90ace63ff1846114eafcd1adb8d1c3
2019-08-28 14:39:33 -07:00
markchien
8fe93b6bda Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours
am: ddce521efa -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I4fb6aa5ec81287040bba2c213a5f06024bd6eddf
2019-08-28 14:24:50 -07:00
markchien
07e500dd00 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours
am: 7ff168c7a1 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ibb2e82ee1d02bb22abe5a10b0e48c80bf7f047cf
2019-08-28 13:56:23 -07:00
Chalard Jean
c677b7a360 [automerger skipped] [automerger] Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca am: cfca80540f am: fc63596439 -s ours
am: 12a7d3fb17 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: Iaaf58bf0a56f51bdb3fd4f4e985b8ccd300d3573
2019-08-27 18:59:35 -07:00
Android Build Merger (Role)
ea7b26e8df Merge "[automerger skipped] [automerger] Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca am: cfca80540f am: fc63596439 am: e5a066c347 -s ours am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history" into qt-qpr1-dev-plus-aosp 2019-08-28 01:46:55 +00:00
Chalard Jean
cfe68e98d2 [automerger skipped] [automerger] Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca am: cfca80540f am: fc63596439
am: e5a066c347 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I7f51443866ceab017be0f839ed085427d41b05bd
2019-08-27 18:46:29 -07:00
markchien
29d52f8e3d [automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 98a30a1eec -s ours am: e693a1fd0f -s ours am: f37b8ca988 -s ours am: 02ec1bfb0c -s ours am: dd9de69fa9 -s ours am: b9184953f6 -s ours
am: 74be0f2027 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Ib8c205e19feb288cdc81daae9997d2e445f54781
2019-08-27 18:45:00 -07:00
Chalard Jean
25f9a876d7 Merge "[automerger skipped] [automerger] Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca am: cfca80540f -s ours am: 51a055b74f -s ours
am: b25738004f -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I50911ba282bf392fd97fb434274199c134162b5d
2019-08-27 18:35:06 -07:00
markchien
d360633930 Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 98a30a1eec -s ours am: e693a1fd0f -s ours am: f37b8ca988 -s ours am: 02ec1bfb0c -s ours am: dd9de69fa9 -s ours am: 9ccbe8219b -s ours
am: 7047cf2117 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I45d5ef3ea5fb454ef1b8bf5c873872701d4adc6e
2019-08-27 18:33:54 -07:00
Chalard Jean
12a7d3fb17 [automerger skipped] [automerger] Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca am: cfca80540f
am: fc63596439 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: Ifc70e95d58b292dd1fff80bb8cf58de5893db0ef
2019-08-27 18:28:31 -07:00
markchien
924f4ae7f3 [automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 98a30a1eec -s ours am: e693a1fd0f -s ours am: f37b8ca988 -s ours am: 02ec1bfb0c -s ours am: dd9de69fa9 -s ours am: b9184953f6 -s ours
am: df838f627b -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I8b23e2efb41c5a84f461a2cd568f542665a475ee
2019-08-27 18:24:15 -07:00
markchien
74be0f2027 [automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 98a30a1eec -s ours am: e693a1fd0f -s ours am: f37b8ca988 -s ours am: 02ec1bfb0c -s ours am: dd9de69fa9 -s ours
am: b9184953f6 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I9fc414222deda6e234b5dfd148036fdbfb653322
2019-08-27 18:19:46 -07:00
Chalard Jean
fc63596439 [automerger] Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca
am: cfca80540f

Change-Id: I884b39bdaad5e5db330e5aa0c93a9d8b200e9321
2019-08-27 18:14:43 -07:00
markchien
b9184953f6 [automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 98a30a1eec -s ours am: e693a1fd0f -s ours am: f37b8ca988 -s ours am: 02ec1bfb0c -s ours
am: dd9de69fa9 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I25d1ae42e9af624b6fad6cc4c05449af1a286d94
2019-08-27 18:13:37 -07:00
Chalard Jean
0bb467ab00 [automerger skipped] [automerger] Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca am: cfca80540f -s ours
am: 51a055b74f -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: Ic6a073e1ca1ef807a4d09bfc058a80e43981fa91
2019-08-27 18:12:26 -07:00
markchien
c5f02a7347 [automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 98a30a1eec -s ours am: e693a1fd0f -s ours am: f37b8ca988 -s ours am: 02ec1bfb0c -s ours am: dd9de69fa9 -s ours
am: 9ccbe8219b -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I50b01dd298c9a2209c7de139dedb179496cc1a97
2019-08-27 18:11:22 -07:00
Chalard Jean
3fd7c3ad83 Merge "[automerger skipped] Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b am: 6688a3468c am: e371d736d4 am: 0ce247cdd8 am: e5c4971286 am: 56909ca698 -s ours am: 935c961f67 -s ours
am: 90c5d8852c -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I2a6e08384c8f9b746933dd53c6f0726f28a76ea9
2019-08-27 17:22:57 -07:00
Chalard Jean
27845bfd4c [automerger skipped] Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b am: 6688a3468c am: e371d736d4 am: 0ce247cdd8 am: e5c4971286 am: 56909ca698 am: 99ef3aff51 -s ours
am: 5442625a3b -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I1913ffb3eb6dc48704df9f9da2a3288712f1c6dc
2019-08-27 17:18:16 -07:00