Android Merger
89a6cd1bc2
Merge changes from topic "am-a1e8782806b548b280daa90a2ff2320c" am: e2201303a6
...
am: 35dfddc30b
Change-Id: I2dc64df145736fa89743ac1b4712790012f3acc9
2018-01-16 22:38:19 +00:00
Adam Vartanian
c1664576c1
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: 482d1b4a62 -s ours am: c0d866facc -s ours
...
am: 65a5896605
Change-Id: I691517e89de3c195af6a2e5448a5f1309f239e62
2018-01-16 22:34:38 +00:00
Android Merger
eaecf41c4f
Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev am: 9f63146b7d
...
am: 57c33efafb
2018-01-16 22:21:53 +00:00
Adam Vartanian
c9cba0429d
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: 482d1b4a62 -s ours
...
am: 6f2dd6d138
2018-01-16 22:18:49 +00:00
Android Merger
57c33efafb
Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev
...
am: 9f63146b7d
2018-01-16 22:14:59 +00:00
Adam Vartanian
6f2dd6d138
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: 482d1b4a62
2018-01-16 22:14:02 +00:00
Android Merger
e2201303a6
Merge changes from topic "am-a1e8782806b548b280daa90a2ff2320c"
...
* changes:
Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev am: 9f63146b7d36c5e0d87f181a10e36484a9da7ac99dc912e515ca0bfec15d482d1b4a62
2018-01-16 22:03:00 +00:00
Android Merger
d6a893adf4
Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev
...
am: 9f63146b7d
2018-01-16 22:02:49 +00:00
Android Build Merger (Role)
f3a95bcbaf
[automerger] Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev am: de16c72207 am: c7dfd663bf am: 829c4cf876
...
am: fd45965e18
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
2018-01-16 21:57:12 +00:00
Adam Vartanian
c0d866facc
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: 482d1b4a62
2018-01-16 21:56:40 +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
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
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
2018-01-16 21:50:37 +00:00
Android Merger
9f63146b7d
Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev
...
* changes:
Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev am: de16c7220736c5e0d87f181a10e36484a9da7ac99dc912e515ca0bfec15d
2018-01-16 21:48:43 +00:00
Android Merger
58d0305cf1
Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev
...
am: de16c72207
2018-01-16 21:48:33 +00:00
Adam Vartanian
482d1b4a62
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
2018-01-16 21:44:11 +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: 5962c9a23436c5e0d87f181a10e36484a9da7ac99dc912e515
2018-01-16 21:38:59 +00:00
Android Merger
280672fd93
Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev
...
am: 5962c9a234
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
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: f582e9dede36c5e0d87f181a10e36484a9da7ac9
2018-01-16 21:32:32 +00:00
Android Merger
dca340db07
Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
...
am: f582e9dede
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
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: 27e23e96ca36c5e0d87f181a10e364
2018-01-16 21:28:42 +00:00
Android Merger
2d8bad1b3b
Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
...
am: 27e23e96ca
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
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
2018-01-13 00:56:27 +00:00
Android Merger
a483aa57bc
Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev
...
am: d1f18aeba3
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
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
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
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
2018-01-13 00:23:17 +00:00
