Android Build Merger (Role)
f3a95bcbaf
[automerger] Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev am: de16c72207 am: c7dfd663bf am: 829c4cf876
...
am: fd45965e18
Change-Id: I55ea6580eb888a40822c26eb5f874ea9bcd88fad
2018-01-16 21:58:06 +00:00
Android Build Merger (Role)
e4ed6248cd
[automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 9dc912e515 -s ours am: ca0bfec15d -s ours am: 694da5a82b am: a86e840b99
...
am: b56b0f7e8b
Change-Id: I94da0302a34af39fc66f5817aaa94844ea190314
2018-01-16 21:57:12 +00:00
Android Build Merger (Role)
eb6a83658e
[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 am: ff85bd8167 skipped: a293dfe711 am: 4f6dffda1d am: 267c79976c
...
am: 8b3cecef9a
Change-Id: I9e9ebdf80094ca9207543822cfeee307416b31c5
2018-01-16 21:55:42 +00:00
Android Build Merger (Role)
fd45965e18
[automerger] Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev am: de16c72207 am: c7dfd663bf am: 829c4cf876
...
Change-Id: If6119aa7b783b7a79e2aec795f9ec9a213af9b66
2018-01-16 21:52:14 +00:00
Android Build Merger (Role)
829c4cf876
[automerger] Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev am: de16c72207 am: c7dfd663bf
...
Change-Id: I36b8851f1859ecc728c4d28f8a8bcd346b7b6aaa
2018-01-16 21:52:10 +00:00
Android Build Merger (Role)
b56b0f7e8b
[automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 9dc912e515 -s ours am: ca0bfec15d -s ours am: 694da5a82b am: a86e840b99
...
Change-Id: I0e9b6675d1781fa7cf2d1d7075f2949855a5b7ae
2018-01-16 21:51:52 +00:00
Android Build Merger (Role)
a86e840b99
[automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 9dc912e515 -s ours am: ca0bfec15d -s ours am: 694da5a82b
...
Change-Id: Ib063cf801b6d9cec6c687d8d668338dfaf6dccbf
2018-01-16 21:51:48 +00:00
Android Merger
c7dfd663bf
Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev
...
am: de16c72207
Change-Id: Icf89210178c6b524949fb26dced2fb58081b7ab0
2018-01-16 21:51:21 +00:00
Adam Vartanian
694da5a82b
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 9dc912e515 -s ours
...
am: ca0bfec15d -s ours
Change-Id: I2a6a198f5fe1ff80dac255765402ce327bfa6109
2018-01-16 21:50:37 +00:00
Android Build Merger (Role)
8b3cecef9a
[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 am: ff85bd8167 skipped: a293dfe711 am: 4f6dffda1d am: 267c79976c
...
Change-Id: I20767cf2f8b8f73720285d2716ad444dd0ea4371
2018-01-16 21:43:40 +00:00
Android Build Merger (Role)
267c79976c
[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 am: ff85bd8167 skipped: a293dfe711 am: 4f6dffda1d
...
Change-Id: Id9de44aa722aa75f21c26d71a2e33db1a934aee6
2018-01-16 21:43:37 +00:00
Android Build Merger (Role)
4f6dffda1d
[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 am: ff85bd8167 skipped: a293dfe711
...
Change-Id: Ia69b9364862014ea59f8001f1b8e19fc912dc279
2018-01-16 21:43:32 +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
de16c72207
Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev
...
* changes:
Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 9dc912e515 -s ours
2018-01-16 21:38:59 +00:00
Android Merger
280672fd93
Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev
...
am: 5962c9a234
Change-Id: If3153994b6609d626af3ed58c47f33aad5cf19ec
2018-01-16 21:38:46 +00:00
Adam Vartanian
ca0bfec15d
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours
...
am: 9dc912e515 -s ours
Change-Id: I29a2fc035147a9ab695dd8ca3e8c1dbabbb83246
2018-01-16 21:36:07 +00:00
Android Merger
5962c9a234
Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev
...
* changes:
Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours
2018-01-16 21:32:32 +00:00
Android Merger
dca340db07
Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
...
am: f582e9dede
Change-Id: Iffcf7f437e5e438796f01dd86e9599047292cd2f
2018-01-16 21:32:21 +00:00
Adam Vartanian
9dc912e515
DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours
...
am: 84a9da7ac9 -s ours
Change-Id: Ie5f8bf09bdb80355c9eac6d5361f089411216ad5
2018-01-16 21:30:40 +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 Build Merger (Role)
29bcde5f0b
Merge "Merge "Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071" into oreo-mr1-cts-dev am: 803a8520c2" into oc-mr1-dev
...
am: 4b266ee8c6
Change-Id: Ie7b3fdb0dac274bd0be177feb62dfbfc0da9159e
2018-01-13 02:30:35 +00:00
Android Build Merger (Role)
09a39d61bd
Merge "Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev am: d1f18aeba3" into oc-mr1-dev
...
am: 51ac8fbe5a
Change-Id: If8e8b4d297ea849f58ba95841021993bb441b171
2018-01-13 02:07:36 +00:00
Android Build Merger (Role)
4c34517ed3
Merge "DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours am: 50ec90be8d -s ours" into oc-mr1-dev
...
am: e0dd5c34bb
Change-Id: I8dd8ba3804c07aa27637aec2e24692d007f39554
2018-01-13 02:01:24 +00:00
Android Build Merger (Role)
91356a44cc
Merge "Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev am: 105ca148a7" into oc-mr1-dev
...
am: d26e73127a
Change-Id: Ic2d313561783adfd7065529b0e2864c267083bd3
2018-01-13 01:09:14 +00:00
Android Build Merger (Role)
5615358c4f
Merge "DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: d9ac06f2c2 -s ours am: bdf5a47c67 -s ours am: 39127a559b -s ours" into oc-mr1-dev
...
am: e06726e055
Change-Id: I2a5e0a669ed6b3934f4869038e54ee34dba1711f
2018-01-13 01:01:01 +00:00
Android Merger
9292b1dc41
Merge "Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071" into oreo-mr1-cts-dev
...
am: 803a8520c2
Change-Id: Ib287baa3d94d6f5429753d4d562cf63c94405df6
2018-01-13 00:56:27 +00:00
Android Merger
a483aa57bc
Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev
...
am: d1f18aeba3
Change-Id: I2610da3036eedc3f748f6e0935bca336fb89fc0b
2018-01-13 00:49:32 +00:00
Adam Vartanian
c5079909e4
DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours
...
am: 50ec90be8d -s ours
Change-Id: Icbd26abefd92d483a221ee527ceec1dd4ea34e41
2018-01-13 00:48:16 +00:00
Android Build Merger (Role)
24c1aaf9f5
Merge "Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev am: dedfb2ca1f" into oc-mr1-dev
...
am: 43be77a8f3
Change-Id: Ib3a8a6922ab3b3547d12db93758857492d3d3e63
2018-01-13 00:41:09 +00:00
Android Build Merger (Role)
8889bedf05
Merge "DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: df249cbcbb -s ours am: cebea26b62 -s ours" into oc-mr1-dev
...
am: 3cfa3d6076
Change-Id: Id4cdcfd6487b888a8f49c513aa0cc47a07a8cf06
2018-01-13 00:33:03 +00:00
Android Merger
d5157ff6b3
Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev
...
am: 105ca148a7
Change-Id: Ied32436daf608f10780ebed67465bed541bbfe8e
2018-01-13 00:27:20 +00:00
Adam Vartanian
c7df0d341d
DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: d9ac06f2c2 -s ours am: bdf5a47c67 -s ours
...
am: 39127a559b -s ours
Change-Id: I08a4c4ddb03510cfde3bb478bb41a051bc553059
2018-01-13 00:25:30 +00:00
Android Merger
438c8d87ba
Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev am: 36407c961d
...
am: 299f737297
Change-Id: I98a5e632e09cac1940bc18b1bc26309c35640f93
2018-01-13 00:23:17 +00:00
Adam Vartanian
0cc76f212b
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours am: d89f75a3db -s ours
...
am: ce8c8029db
Change-Id: I9878eb189a75d1ec55464f434d4ed57b2330a7f1
2018-01-13 00:18:47 +00:00
Android Merger
bbe1065cc8
Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev
...
am: dedfb2ca1f
Change-Id: I5d7e0f0a8b8c2596e0e70b5b1fb847ea100fec44
2018-01-13 00:17:39 +00:00
Adam Vartanian
05f547c34f
DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: df249cbcbb -s ours
...
am: cebea26b62 -s ours
Change-Id: I539adb80bac59928a37449ec6e81137ec78dd2f8
2018-01-13 00:15:51 +00:00
Android Merger
299f737297
Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev
...
am: 36407c961d
Change-Id: I176a7a6298802e8f837bfb2eccfe4e8427907169
2018-01-13 00:09:25 +00:00
Adam Vartanian
ce8c8029db
DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours
...
am: d89f75a3db -s ours
Change-Id: I556b7871c6336c76c15559540534fee5016128f3
2018-01-13 00:08:36 +00:00
Android Merger
921d7f97f9
Merge "Merge "Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071" into oreo-mr1-cts-dev am: 803a8520c2" am: 93dcd95b8b
...
am: ee062ddb20
Change-Id: I01ca5f9031843320dde94e6d22973a446423faa7
2018-01-12 00:48:17 +00:00
Alex Vakulenko
532d9e9f29
Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071 am: 5a35f88cbb am: 8324e947c3
...
am: cf9ee25695
Change-Id: I471d0a7d7c616fdfe792d05ad63762da941dbb36
2018-01-12 00:28:38 +00:00
Alex Vakulenko
cf9ee25695
Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071 am: 5a35f88cbb
...
am: 8324e947c3
Change-Id: Ie74187a985dcfa543e1ccd489cf5019d1a46db9e
2018-01-12 00:23:34 +00:00
Android Merger
38d8d81212
Merge changes from topic "am-dd7b05d27e59420687cc02c82e51669b" am: 7898d269e2
...
am: 9b40813361
Change-Id: I80dd1fb1ace8d0fb26597957926e4de58b288615
2018-01-12 00:21:49 +00:00
Adam Vartanian
b59215308a
DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours am: 50ec90be8d -s ours am: d5544e43e2 -s ours
...
am: 16488117dc
Change-Id: Iad1dd95c87dd38c8162c07f894245410890d1949
2018-01-12 00:18:44 +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
Alex Vakulenko
8324e947c3
Merge "Add a delay before toggling WiFi to let listening activity to start up" into oreo-cts-dev am: 9992c29071
...
am: 5a35f88cbb
Change-Id: Id3ca47b04227c1a5425eb156095a387f4cced06a
2018-01-12 00:17:04 +00:00