Commit Graph

1515 Commits

Author SHA1 Message Date
Adam Vartanian
6dc8d5cc2f DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: 8cb75edc3a am: 43aea5638c am: e37b9c0c15 am: 7529662078
am: 4173b8bf71  -s ours

Change-Id: I6093940b82b4e530332665731c56905a2c1c891a
2018-01-10 21:00:27 +00:00
Android Build Merger (Role)
d82562eb66 Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-dev am: 2cfab2140f am: 7169916e4f
am: bd14f4f4ff

Change-Id: I6811725aa66fb6c10e39c1c675c2dcac0a5dcd6a
2018-01-10 20:27:08 +00:00
Adam Vartanian
a69195c421 Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d am: c6743de860 am: d58943f9bd am: c6545ebce1 am: 0f3607adf8
am: 09a3a15afe

Change-Id: Ib7e7465076cc818c0523253a0ee19563245217e6
2018-01-10 20:20:10 +00:00
Adam Vartanian
6329a0e2ae DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: efb0258e08 am: 2c7b1033b8 am: e3542ba9d1 am: e1544712ff
am: bc161e0872  -s ours

Change-Id: Ib7ff35497ec6f02d58db695954ae32b2ba75bb01
2018-01-10 20:18:34 +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
Android Merger
a88a1fed27 Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4 am: a463421450 am: 983bd08331
am: 178f67f69d

Change-Id: Ifb2144f66596e22fc1a985815b98b63e16ce212c
2018-01-10 19:53:42 +00:00
Adam Vartanian
9dcd9abb3e DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: bf44542d59 am: 9d37478448
am: f927fe1b92  -s ours

Change-Id: I2d66e421530d89f53ae02bf8e41a9ac555cb40f2
2018-01-10 19:51:04 +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
Android Build Merger (Role)
2f8017a25a Merge changes from topic "am-177bacee3d764303895ed5e1e72bf859" into oc-dev
* changes:
  Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996 am: ce2230abfd am: 23d6ba00ec am: f26da6af2c
  DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 78f5d24a4f am: 2f42f87a5f am: be7378e99b  -s ours
2018-01-10 19:45:11 +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
32a33fba66 Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996 am: ce2230abfd am: 23d6ba00ec
am: f26da6af2c

Change-Id: I63a73cd58a89a2dfddc03cf1d7b662b311c2c2e3
2018-01-10 19:41:53 +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 Merger
f2b8d031ab Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev
am: afff62b0b9

Change-Id: I0ffdf433f50d14f9b2000eba363e5252a2b3e93d
2018-01-10 19:40:26 +00:00
Adam Vartanian
5f8387ec67 DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 78f5d24a4f am: 2f42f87a5f
am: be7378e99b  -s ours

Change-Id: If7c4dd7ea9d85ddd0bd54fb4b234418d315e5e5b
2018-01-10 19:40:23 +00:00
Adam Vartanian
ec320be2b3 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

Change-Id: I26d7d4dd3d6eb4ef7d91b302911b8f848dcd1931
2018-01-10 19:39:50 +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
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
Android Merger
b14f56b2c3 Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev
am: d9aadde604

Change-Id: I9a9f644d102fb0bf576806a450fcb70bfc428ddb
2018-01-10 19:29:47 +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
2ff1dfc44f DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours
am: df249cbcbb  -s ours

Change-Id: I805acab23406098716c465c6711a95a4845e17b6
2018-01-10 19:29:14 +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
afff62b0b9 Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-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:26:23 +00:00
Android Merger
865adee70d Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev
am: 293664a1fb

Change-Id: I4fb988a1a18189c4dd34d2154b42be227d346c82
2018-01-10 19:25:56 +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
Adam Vartanian
8cb75edc3a DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours
am: dfbb7a24e1  -s ours

Change-Id: Id23f5b58c058be206490b403981c850edff8f338
2018-01-10 19:24:07 +00:00
Adam Vartanian
e3542ba9d1 DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: efb0258e08
am: 2c7b1033b8

Change-Id: Ie987c2d765efa619cbc5d5dfd9e24787f738e766
2018-01-10 19:23:50 +00:00
Adam Vartanian
bdf5a47c67 DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours
am: d9ac06f2c2  -s ours

Change-Id: I65c91a852c2e7f580a2b58098786b9e39d380d10
2018-01-10 19:23:29 +00:00
Android Merger
1858de921d Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
am: fa209394f0

Change-Id: Ib97632986b715e1ae2148287d0d6d530bb5124ad
2018-01-10 19:23:08 +00:00
Adam Vartanian
7ae5d30389 DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours
am: 7955a4e8d8  -s ours

Change-Id: I38ba41fa89303dad989c86bba8fd0ba8bf0e1b13
2018-01-10 19:22:38 +00:00
Adam Vartanian
23d6ba00ec Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996
am: ce2230abfd

Change-Id: I4b9a5a91bd54c1d1b04a9755962353b71a03c5eb
2018-01-10 19:21:56 +00:00
Adam Vartanian
2f42f87a5f DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours
am: 78f5d24a4f

Change-Id: I71f9c69b951e5ab1add383d5f26f7bdcbc4fe519
2018-01-10 19:21:03 +00:00
Android Merger
a463421450 Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev
am: f59fbfb5a4

Change-Id: Ic6b7c2ca51efefa07d07f25aa8636067dfd15069
2018-01-10 19:20:38 +00:00
Adam Vartanian
d58943f9bd Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d
am: c6743de860

Change-Id: I4a7465bfae8fec503987e7587d81e74982fd57b8
2018-01-10 19:18:46 +00:00
Adam Vartanian
bf44542d59 DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours
am: 175d980772  -s ours

Change-Id: Ib86bbf945a20b57aef400db20614de5aab0a7d86
2018-01-10 19:18:36 +00:00
Android Merger
293664a1fb Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev
* changes:
  Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105
  DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours
2018-01-10 19:18:17 +00:00
Adam Vartanian
2c7b1033b8 DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours
am: efb0258e08

Change-Id: Ied68f3ae10135b491ae4583eacd8f8bceaa76c5e
2018-01-10 19:18:02 +00:00
Android Merger
c0b039c346 Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev
am: bc18e7e105

Change-Id: I383d04d335a27c522758b7838f124333822c5e02
2018-01-10 19:17:53 +00:00
Adam Vartanian
d9ac06f2c2 DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours
am: dfbb7a24e1  -s ours

Change-Id: I802ec14db281665d47ae01ab90b0f8797237a2f2
2018-01-10 19:16:50 +00:00
Android Merger
d9aadde604 Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev
* changes:
  Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4
  DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours
2018-01-10 19:15:20 +00:00
Adam Vartanian
ce2230abfd Merge changes from topic "n1" into nougat-mr1-cts-dev
am: 76faaa3996

Change-Id: I74f70be3489966d4ee6b170fa0198f1d221f6044
2018-01-10 19:15:04 +00:00
Adam Vartanian
78f5d24a4f DO NOT MERGE Add CTS test for URI fix.
am: 08044f045c  -s ours

Change-Id: Iab63360367bfe64757864efd848bc5b117a71f85
2018-01-10 19:14:52 +00:00
Android Merger
c8d546b3ab Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev
am: f59fbfb5a4

Change-Id: I845720eea2e308e886afd2c900f66bfdff24679d
2018-01-10 19:14:50 +00:00
Android Merger
bc18e7e105 Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev
* changes:
  Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607
  DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours
2018-01-10 19:13:47 +00:00
Adam Vartanian
2ba7ef5b48 Merge changes from topic "mm" into marshmallow-cts-dev
am: 2996702607

Change-Id: I210f8b36685e9e1dbcc2916b921501ed55ddb1fb
2018-01-10 19:13:07 +00:00
Adam Vartanian
df249cbcbb DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours
am: 175d980772  -s ours

Change-Id: I9f2de682ef6178fa6c58781e393f53b96ccb2e1e
2018-01-10 19:12:57 +00:00
Adam Vartanian
dfbb7a24e1 DO NOT MERGE Add CTS test for URI fix.
am: 1efb5151db  -s ours

Change-Id: I7cb28b5ac56f616a23a99d466606da8221eaa58e
2018-01-10 19:12:49 +00:00
Adam Vartanian
c6743de860 Merge changes from topic "n" into nougat-cts-dev
am: a220d6d27d

Change-Id: I1228020231b3d1e0d9e26891b813060bcc862c4c
2018-01-10 19:12:04 +00:00