Android Build Merger (Role)
bb10187fd0
Merge "[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours am: 9b319aa0ef -s ours am: e6bf3b799e -s ours am: 2c5ac01165 -s ours am: 6fe647716f -s ours am: 0a623c8a66 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history" into qt-qpr1-dev-plus-aosp
2019-08-01 04:46:04 +00:00
Mark Chien
57996b1fb6
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours am: 9b319aa0ef -s ours am: e6bf3b799e -s ours am: 2c5ac01165 -s ours am: 6fe647716f -s ours
...
am: 0a623c8a66 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: Idfdaf0eb3a1d03c5a8f43610d4667e6f5849da48
2019-07-31 21:45:44 -07:00
Mark Chien
c7a627f4a4
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours am: 9b319aa0ef -s ours am: e6bf3b799e -s ours am: 2c5ac01165 -s ours
...
am: 5eaa7d029a -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I3b1b501fe34c2d00c9af688e2cc58f2a2b4dbf63
2019-07-31 21:34:15 -07:00
Mark Chien
5eaa7d029a
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours am: 9b319aa0ef -s ours am: e6bf3b799e -s ours
...
am: 2c5ac01165 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I7fb5564c6a23c6824b3df17151ec1af0fc613b13
2019-07-31 21:23:24 -07:00
Mark Chien
6fe647716f
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours am: 9b319aa0ef -s ours am: e6bf3b799e -s ours
...
am: 2c5ac01165 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I1d24f04eaeb01f72b7448688a6c63c359f1a97c8
2019-07-31 21:23:23 -07:00
Mark Chien
2c5ac01165
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours am: 9b319aa0ef -s ours
...
am: e6bf3b799e -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I57a24748b4bb6abaa50a9ff43fffb235ce54d6c1
2019-07-31 21:11:24 -07:00
Mark Chien
e6bf3b799e
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours
...
am: 9b319aa0ef -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: Ia0a4c5b6dacdb18ddfeead56ebbc9d5d843f9a3d
2019-07-31 20:46:59 -07:00
Mark Chien
9b319aa0ef
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours
...
am: ecaabe8f3e -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I8f7399472b3060ad1c2a2c22e534855d8ed15486
2019-07-31 20:34:15 -07:00
Mark Chien
ecaabe8f3e
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev
...
am: 704a9a46d8 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: If59203a033c02f870646db01d5f15029ffc8ac5c
2019-07-31 20:22:14 -07:00
Android Build Merger (Role)
13a268e886
[automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f am: 21e123fdf6 am: 9ee527d848 skipped: ca53691112
...
Change-Id: I6ac7579f1b95830997c573afa5f0241161c7c0ed
2019-07-29 02:08:46 +00:00
Android Build Merger (Role)
ca53691112
[automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f am: 21e123fdf6 am: 9ee527d848
...
Change-Id: I26195a3e5bc6146eedc178830055633d115a5c24
2019-07-29 02:07:59 +00:00
Android Build Merger (Role)
9ee527d848
[automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f am: 21e123fdf6
...
Change-Id: Ie7fd5c786de0da298e2a2a3dd34ad5d5d4dab98d
2019-07-29 02:07:54 +00:00
Android Build Merger (Role)
21e123fdf6
[automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f
...
Change-Id: Idd42f33615f8e2e08cd60082d805bf85ff6be4d0
2019-07-29 02:07:48 +00:00
Android Build Merger (Role)
1635ad610f
[automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617
...
Change-Id: Ib59590b6ec8012bd56dc02fd485ffb5a693dd38f
2019-07-29 02:07:39 +00:00
markchien
c4031da617
Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev
...
am: 873f2d8aa3
Change-Id: Ic968bb8f93e3471b9b5b47d336752957b23ce16b
2019-07-26 09:50:47 -07:00
markchien
dd32bb52f7
Exempt adb socket for hostside VpnTest
...
Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.
Bug: 119382723
Bug: 135225500
Bug: 126645908
Test: Just cherry-pick with conflict fix
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: Id6f986aacc3cadf713ebbc8305ca535b861390fc
(cherry picked from commit de0f268f78 )
2019-07-18 12:43:04 +00:00
Julien Desprez
eebac35308
Merge "Mark module as "secondary_user" since it uncovered bug before" am: a9a8bf6ae3 am: 8ceae71f63
...
am: 9ba88ea670
Change-Id: Ib819a6d4c83848bb58236c570a07d0557de01e60
2019-07-16 15:47:44 -07:00
Julien Desprez
9ba88ea670
Merge "Mark module as "secondary_user" since it uncovered bug before" am: a9a8bf6ae3
...
am: 8ceae71f63
Change-Id: If445d844a36df7170e91fe1dc2dd2e598db3bbc8
2019-07-16 15:37:40 -07:00
Julien Desprez
8ceae71f63
Merge "Mark module as "secondary_user" since it uncovered bug before"
...
am: a9a8bf6ae3
Change-Id: I1623fe3304417ae683a01c590956b98dc4a9dbda
2019-07-16 15:28:48 -07:00
Treehugger Robot
a9a8bf6ae3
Merge "Mark module as "secondary_user" since it uncovered bug before"
2019-07-16 21:55:44 +00:00
Xin Li
e6edabecb3
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 5000dc4dca -s ours am: b6be832837 -s ours
...
am: 54b8624d50
Change-Id: I2ad2b5ab1f9822baa2abb56e709790aa17dd54ab
2019-07-10 22:47:27 -07:00
Xin Li
54b8624d50
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 5000dc4dca -s ours
...
am: b6be832837 -s ours
am skip reason: subject contains skip directive
Change-Id: Icbfe91d0f69589d762bbc519d14ee88b09366601
2019-07-10 22:13:38 -07:00
Xin Li
b6be832837
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
am: 5000dc4dca -s ours
am skip reason: subject contains skip directive
Change-Id: I4919279e2248438651496fae61eb40842a706bcc
2019-07-10 21:19:46 -07:00
junyulai
c3de7735af
[automerger skipped] Merge "Resolve resource ID at runtime to stabilize tests" into qt-dev am: 288024db11 -s ours
...
am: f8f32911db -s ours
am skip reason: change_id Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6 with SHA1 223fae9a7f is in history
Change-Id: I07e3ec41dd669b93c045380b100a735a369ffa64
2019-07-10 15:11:15 -07:00
junyulai
4c84a1364a
[automerger skipped] Merge "Resolve resource ID at runtime to stabilize tests" into qt-dev am: 288024db11 -s ours
...
am: 6cb8ac23ef -s ours
am skip reason: change_id Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6 with SHA1 223fae9a7f is in history
Change-Id: I38727597242f81234c034f0b1f80c44ccb0921ad
2019-07-10 15:09:05 -07:00
junyulai
6cb8ac23ef
[automerger skipped] Merge "Resolve resource ID at runtime to stabilize tests" into qt-dev
...
am: 288024db11 -s ours
am skip reason: change_id Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6 with SHA1 223fae9a7f is in history
Change-Id: Ie6c89c33cae39d4b0da83b99fb1434e72057cc47
2019-07-10 14:56:12 -07:00
junyulai
f8f32911db
[automerger skipped] Merge "Resolve resource ID at runtime to stabilize tests" into qt-dev
...
am: 288024db11 -s ours
am skip reason: change_id Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6 with SHA1 5764173a9f is in history
Change-Id: Ie2fec5bdde1a7c3bf7fced8ca28bd30493cf3374
2019-07-10 14:56:06 -07:00
TreeHugger Robot
288024db11
Merge "Resolve resource ID at runtime to stabilize tests" into qt-dev
2019-07-10 21:39:17 +00:00
Xin Li
5000dc4dca
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
Bug: 136196576
Change-Id: I51435cf03e91cb11ea8027b226f8dbf6eb2b1e73
2019-07-10 09:50:54 -07:00
android-build-team Robot
27b8409b39
Snap for 5622519 from 9954e55f3cdb63682fb59d8cbbd0a611b2bacc68 to pi-platform-release
...
Change-Id: Ib718f08062790b0a7553978410946e591c58a283
2019-07-08 23:33:57 +00:00
Android Build Merger (Role)
42aea8fc99
Merge "[automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours am: ac180af96d -s ours am: 318b0296dd -s ours am: 06f11f519f -s ours am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history" into qt-r1-dev-plus-aosp
2019-07-08 20:50:03 +00:00
Lorenzo Colitti
58a64b6873
[automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours am: ac180af96d -s ours am: 318b0296dd -s ours
...
am: 06f11f519f -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: I56f9a6cc1002bb293fbd041634c001f52d06d3ca
2019-07-08 13:49:44 -07:00
Lorenzo Colitti
11dd967d07
[automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours am: ac180af96d -s ours am: 318b0296dd -s ours
...
am: 4ec16da603 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: I0a5f1172dd59c0d7126db630cac4735de7efa582
2019-07-08 13:49:37 -07:00
Lorenzo Colitti
4ec16da603
[automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours am: ac180af96d -s ours
...
am: 318b0296dd -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: Idb010f117182360c116be8b1697e4b66d00c49f6
2019-07-08 13:34:41 -07:00
Lorenzo Colitti
06f11f519f
[automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours am: ac180af96d -s ours
...
am: 318b0296dd -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: Ic1bd0bc8ca4972739af578e6e8f305a9fc111e63
2019-07-08 13:34:39 -07:00
Lorenzo Colitti
318b0296dd
[automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours
...
am: ac180af96d -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: Ieb4935ff494284c71dd7e7bc186076745a563606
2019-07-08 13:22:39 -07:00
Lorenzo Colitti
ac180af96d
[automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours
...
am: 6b43dd2a19 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: I60f7d208ec780c241b674b78b656eec1781b768c
2019-07-08 13:12:36 -07:00
Lorenzo Colitti
6b43dd2a19
[automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours
...
am: c37cc1e4f1 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: Ie1bb4a36b1e572bfccf1c9e074835cbc1c9a464d
2019-07-08 12:57:09 -07:00
Lorenzo Colitti
c37cc1e4f1
[automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4
...
am: d66e639f31 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: I74cbd632b1a20501cfead409b87632adb1acc339
2019-07-08 12:43:04 -07:00
Android Build Merger (Role)
d66e639f31
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4
...
Change-Id: I428b1ee7884c4177062279b5fb600c9fc239bee5
2019-07-08 19:24:16 +00:00
Android Build Merger (Role)
7dc43d91c4
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47
...
Change-Id: I9914b8be6955431a5f2340716d018d236f709dd1
2019-07-08 19:24:10 +00:00
Android Build Merger (Role)
5530604a47
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3
...
Change-Id: Ia7b615ad33acdcee358ceaa5a424e4bfff155998
2019-07-08 19:24:06 +00:00
Android Build Merger (Role)
e386847db3
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76
...
Change-Id: If285f192d8078cd4934e6700b3b6a535185f1b53
2019-07-08 19:23:59 +00:00
Android Build Merger (Role)
8e99f9ef76
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5
...
Change-Id: I03f5b6a01337158727e56ad60a79d9f2a87daf7e
2019-07-08 19:23:55 +00:00
Android Build Merger (Role)
047d1a9ed5
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4
...
Change-Id: I0669f124ad6d84592053ac199c7fd1831fb8f7d3
2019-07-08 19:23:50 +00:00
Android Build Merger (Role)
cbc0a6b066
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c
...
Change-Id: I3611dbe31a1c1d42c22549e065dce570e97bada3
2019-07-08 19:23:45 +00:00
Lorenzo Colitti
e6ced2f716
Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev
...
am: dd55552460
Change-Id: I6f2775a58f5c72effd7d04e031abb61df569dbb3
2019-07-08 12:23:07 -07:00
Treehugger Robot
dd55552460
Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev
2019-07-08 18:39:08 +00:00
Junyu Lai
da507ff0df
[automerger skipped] Merge "Resolve resource ID at runtime to stabilize tests" am: f9b69119bf am: 44022a761d
...
am: 1eaa996e29 -s ours
am skip reason: change_id Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6 with SHA1 5764173a9f is in history
Change-Id: Iad15c30ffb2ac954a9cfde98deaae73786ec61ce
2019-07-07 19:56:33 -07:00
Junyu Lai
44022a761d
Merge "Resolve resource ID at runtime to stabilize tests"
...
am: f9b69119bf
Change-Id: I441a025af2263522fc4c14cb2fd17ccffe149819
2019-07-07 19:39:29 -07:00