Android Build Merger (Role)
7f4a3db8e5
[automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be am: b986143870
...
Change-Id: I3844fb6083799d1975c43644b66c69ec5611283e
2018-01-17 02:46:03 +00:00
Android Build Merger (Role)
b986143870
[automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d am: af696171be
...
Change-Id: I475e52bc05a9a602cb8d99fbf1468832686b69c0
2018-01-17 02:45:59 +00:00
Android Build Merger (Role)
af696171be
[automerger] Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede am: 02c0ecc53d
...
Change-Id: I28da24aaf125a8ada71b760c42e03ad7bef5bfcf
2018-01-17 02:45:55 +00:00
Android Build Merger (Role)
bf5ae9c33b
[automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f am: 16b7318a02
...
Change-Id: I2197bc67084542f213abff49139bd333eba63484
2018-01-17 02:44:44 +00:00
Android Build Merger (Role)
16b7318a02
[automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f
...
Change-Id: I7df1041d1cd9f582534af512a99774288d41d4eb
2018-01-17 02:44:40 +00:00
Android Build Merger (Role)
a8a391899f
[automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23
...
Change-Id: I4b5d6970b199efd861d25633abd0433446ca1304
2018-01-17 02:44:37 +00:00
Android Merger
02c0ecc53d
Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
...
am: f582e9dede
Change-Id: Ie9702984ab2e7a3d90ce0237d5c5593446d4b664
2018-01-17 02:44:23 +00:00
Adam Vartanian
3ba9598f23
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours
...
am: 84a9da7ac9 -s ours
Change-Id: Ic32802e983f9a464d629873909380682f3fb2c34
2018-01-17 02:42:57 +00:00
Android Build Merger (Role)
ff85bd8167
[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1 am: b9a731a6c9 am: d504634c49 am: 464b0360d7
...
Change-Id: I401ba8a95fd1307e3472595f88e67436bbdaf75a
2018-01-16 21:43:25 +00:00
Android Build Merger (Role)
464b0360d7
[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1 am: b9a731a6c9 am: d504634c49
...
Change-Id: I0444212f97b92755ef9f52f973e4dd2fde494d04
2018-01-16 21:43:22 +00:00
Android Build Merger (Role)
d504634c49
[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1 am: b9a731a6c9
...
Change-Id: Ice6945e3f3c9910922c8bc6c61cb1e9f2aba647c
2018-01-16 21:43:19 +00:00
Android Build Merger (Role)
b9a731a6c9
[automerger] DO NOT MERGE: Fix issue of also adding "<packge>2" am: 9abf6a313b am: 83c8faf6d9 am: ffed9269ba skipped: 8a8bebe6a1
...
Change-Id: I5d3d4f63359eec49e4d57613ff6c7c77d7377d6e
2018-01-16 21:43:15 +00:00
Android Merger
f582e9dede
Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
...
* changes:
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev am: 27e23e96ca
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours
2018-01-16 21:28:42 +00:00
Android Merger
2d8bad1b3b
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
...
am: 27e23e96ca
Change-Id: Ic1e94cf87bd0cf722ba1212ae0251d3c06f93f73
2018-01-16 21:28:30 +00:00
Adam Vartanian
84a9da7ac9
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours
...
am: 181a10e364 -s ours
Change-Id: Iea8aaec612ff4837000fece3813764b424f9227b
2018-01-16 21:27:42 +00:00
Android Merger
edf8250d28
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev am: 27e23e96ca am: 326fcb43e5
...
am: e98d4f9f59
Change-Id: I8c851ce455f33edf9b949769c409f9484d905500
2018-01-12 00:17:09 +00:00
Adam Vartanian
eb712f2808
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 18e3114317
...
am: b7a93eb721
Change-Id: I758fa1d489e64c82465443cc6f91a23673060d7d
2018-01-12 00:16:34 +00:00
Android Merger
326fcb43e5
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
...
am: 27e23e96ca
Change-Id: I6426e42847ee1f039deeea78380525fb2ef4344a
2018-01-12 00:08:17 +00:00
Adam Vartanian
18e3114317
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours
...
am: 181a10e364 -s ours
Change-Id: I02d9a3e66d85372055c4f29a54fad3679cece053
2018-01-12 00:07:35 +00:00
Android Merger
27e23e96ca
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
...
* changes:
Merge changes from topic "l1" into lollipop-mr1-cts-dev am: ba3927948d
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours
2018-01-11 23:56:54 +00:00
Adam Vartanian
b0ba87dd9b
Merge changes from topic "l1" into lollipop-mr1-cts-dev
...
am: ba3927948d
Change-Id: I71f9c4d293a0913b3274b070a6ed50c4731ab1b1
2018-01-11 23:56:45 +00:00
Adam Vartanian
181a10e364
DO NOT MERGE Add CTS test for URI fix.
...
am: 36c5e0d87f -s ours
Change-Id: I3f40aa91536bde04f153c3f0d6c218b556d40238
2018-01-11 23:56:40 +00:00
Treehugger Robot
ba3927948d
Merge changes from topic "l1" into lollipop-mr1-cts-dev
...
* changes:
DO NOT MERGE Add CTS test for URI fix.
DO NOT MERGE Add EffectBundleTest
DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-11 23:52:44 +00:00
Adam Vartanian
36c5e0d87f
DO NOT MERGE Add CTS test for URI fix.
...
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c )
2018-01-11 15:18:47 -08:00
Adam Vartanian
6c9e5f4147
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442 am: 782f3283ab am: a7461df68d am: 30b0aafe67
...
am: 1c1e1188b8
Change-Id: I8378e67499eef036024ead9bb80a2ec46c1284bf
2018-01-10 20:46:27 +00:00
Adam Vartanian
a49852f69d
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9 -s ours am: abd196715f am: d18aefffcf
...
am: d1d09b39d9
Change-Id: I4f0e6b89262f102756919467ec47786146ddbd7b
2018-01-10 20:44:45 +00:00
Adam Vartanian
1c1e1188b8
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442 am: 782f3283ab am: a7461df68d
...
am: 30b0aafe67
Change-Id: I9474a516750548db3e35cde1175a3585dd8b5a50
2018-01-10 20:34:19 +00:00
Adam Vartanian
d1d09b39d9
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9 -s ours am: abd196715f
...
am: d18aefffcf
Change-Id: I7c8519b6a1a747d2e104f5a9b349e2607906bdb5
2018-01-10 20:32:57 +00:00
Adam Vartanian
30b0aafe67
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442 am: 782f3283ab
...
am: a7461df68d
Change-Id: I69612b0668fb43f0026b2fe37fd58becec9e15a3
2018-01-10 20:19:57 +00:00
Adam Vartanian
d18aefffcf
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9 -s ours
...
am: abd196715f
Change-Id: I4286ec388c3f85b681909b049cac2a2378e6ed27
2018-01-10 20:18:47 +00:00
Android Merger
c0a1334c94
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105 am: bfbc502b70 am: 02489fed37
...
am: 25b87f5cad
Change-Id: Ia60c9772588e09116ba94c71cd7e22bcf24972f0
2018-01-10 20:13:45 +00:00
Adam Vartanian
7529662078
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: 8cb75edc3a am: 43aea5638c
...
am: e37b9c0c15
Change-Id: Ifb4d28de149b96376bd01d0dae82e2ea4677c67e
2018-01-10 20:12:04 +00:00
Android Build Merger (Role)
7169916e4f
Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-dev
...
am: 2cfab2140f
Change-Id: I47143f087d2b880301afada9e50d5a84995b04d5
2018-01-10 19:54:32 +00:00
Adam Vartanian
a7461df68d
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d am: b7279d7562 am: 017cac1442
...
am: 782f3283ab
Change-Id: I697056d07928751b8a9fd28b1e7d62dfd11cb2ca
2018-01-10 19:50:58 +00:00
Adam Vartanian
abd196715f
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900
...
am: b1969e0aa9 -s ours
Change-Id: I74ea94e5691e20770173a16a4236d894ed016a39
2018-01-10 19:50:09 +00:00
Android Merger
25b87f5cad
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105 am: bfbc502b70
...
am: 02489fed37
Change-Id: Icab80887d9a2f2cb8efe9da889a7c6ddd2f41ba1
2018-01-10 19:47:30 +00:00
Adam Vartanian
e37b9c0c15
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: 8cb75edc3a
...
am: 43aea5638c
Change-Id: I4d696f302b745c844bb049556f17bb87f828c64a
2018-01-10 19:45:59 +00:00
Adam Vartanian
0f3607adf8
Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d am: c6743de860 am: d58943f9bd
...
am: c6545ebce1
Change-Id: Ie8d9cf63e077a46a295f9314658ef3633b5e753b
2018-01-10 19:42:01 +00:00
Adam Vartanian
e1544712ff
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: efb0258e08 am: 2c7b1033b8
...
am: e3542ba9d1
Change-Id: I079a60c74dbe0eb39db7a8706db790fd1dde2b6f
2018-01-10 19:40:36 +00:00
Android Build Merger (Role)
2cfab2140f
Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-dev
...
* changes:
Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev am: 293664a1fb
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: d9ac06f2c2 -s ours
2018-01-10 19:39:44 +00:00
Android Merger
02489fed37
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105
...
am: bfbc502b70
Change-Id: Id84bbe631bf0cd7dacec5a93096e5c3b657b0ae0
2018-01-10 19:35:37 +00:00
Adam Vartanian
43aea5638c
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours
...
am: 8cb75edc3a
Change-Id: I1a2e5c168e011aa9e4b5cda1cc264293ec32e834
2018-01-10 19:34:50 +00:00
Android Merger
983bd08331
Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4
...
am: a463421450
Change-Id: Ib02217fd6d4741ff4273e28661658f6b25e2f687
2018-01-10 19:31:18 +00:00
Android Merger
df56d8e2d0
Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev
...
am: 293664a1fb
Change-Id: I24b0b2bff4c68f185a0ed0ef62cc00a1cf1ef185
2018-01-10 19:30:41 +00:00
Adam Vartanian
017cac1442
Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d
...
am: b7279d7562
Change-Id: I1e4f6c9b0a217422b8f9b8a3d031d6f4c5c25592
2018-01-10 19:29:58 +00:00
Adam Vartanian
9d37478448
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours
...
am: bf44542d59
Change-Id: I0816911863c6afaef6b03ec1e8c81fa56a89664a
2018-01-10 19:29:44 +00:00
Adam Vartanian
6f4857d900
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0
...
am: c0411106a9
Change-Id: I9b4f33e8726faeedc3e00d00a1ff69826e7467f4
2018-01-10 19:29:33 +00:00
Adam Vartanian
f456658884
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours
...
am: d9ac06f2c2 -s ours
Change-Id: I67feb6491c120e42f274aa78e553a3127cbe475e
2018-01-10 19:28:21 +00:00
Android Merger
bfbc502b70
Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev
...
am: bc18e7e105
Change-Id: I1ea99297879174cd2b91f05408d765e705c612d4
2018-01-10 19:25:44 +00:00
Adam Vartanian
c6545ebce1
Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d am: c6743de860
...
am: d58943f9bd
Change-Id: Ie9e2f0cf91733e72e08dff48eb92434a3188f116
2018-01-10 19:24:46 +00:00