Commit Graph

1905 Commits

Author SHA1 Message Date
Adam Vartanian
6ea80d5148 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 am: 6329a0e2ae am: 7666fbb478
am: 0fc0967340

Change-Id: I605c18081e086bb5ddc1698d8a616c1e99e1c8c9
2018-01-10 21:25:16 +00:00
Android Build Merger (Role)
513080c4d3 Merge changes from topic "am-ab809732e70048beb4646f9609db691c" into oc-mr1-dev-plus-aosp
* changes:
  Merge changes from topic "am-a5bc4e54a433400f95783af4f8ba4da2" am: c660e3c3f2 am: f73858ce33
  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 am: 2181876b7e  -s ours am: 09167ba006
2018-01-10 21:20:52 +00:00
Android Merger
37e7e020fe Merge changes from topic "am-a5bc4e54a433400f95783af4f8ba4da2" am: c660e3c3f2
am: f73858ce33

Change-Id: I871ab2ed32687d2b3c81c72b128d160beee9080f
2018-01-10 21:19:07 +00:00
Android Merger
b74553ee64 Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4 am: a463421450 am: 983bd08331 am: 178f67f69d am: a88a1fed27 am: 7071758bd8
am: 7edafe88ad

Change-Id: Ib3aefd34dc9e0ee3cb29b8b41471e7b67343850e
2018-01-10 21:18:45 +00:00
Adam Vartanian
12b98db4c3 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 am: 2181876b7e -s ours
am: 09167ba006

Change-Id: I22769728e593d7d5dd8956448306c235b7544567
2018-01-10 21:14:49 +00:00
Adam Vartanian
0fc0967340 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 am: 6329a0e2ae
am: 7666fbb478

Change-Id: I5922270f1b0bd300db1bbe874574a580766a1a8b
2018-01-10 21:14:14 +00:00
Adam Vartanian
abf05416b9 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 am: 9dcd9abb3e am: b33a9da44e
am: fe6272b12e

Change-Id: I37781e2ea22d5cefe80646692b8863e189bbc3c1
2018-01-10 21:13:17 +00:00
Android Build Merger (Role)
11c9381256 Merge changes from topic "am-78d56b92e8374ea69d3020f927cd3a08" into oc-mr1-dev-plus-aosp
* changes:
  Merge changes from topic "am-19e9244725df4b0eb80716c24e59ab9c" am: 420c69b8a1 am: 688b3f537e
  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 am: e104b8132d  -s ours am: afbc49ee96
2018-01-10 20:52:17 +00:00
Android Merger
d9e3b064ef Merge changes from topic "am-19e9244725df4b0eb80716c24e59ab9c" am: 420c69b8a1
am: 688b3f537e

Change-Id: I876698eb3453dd65ff0f0116c148f2812ec9a60b
2018-01-10 20:41:43 +00:00
Android Merger
7edafe88ad Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4 am: a463421450 am: 983bd08331 am: 178f67f69d am: a88a1fed27
am: 7071758bd8

Change-Id: I72ec5e42fc9567cb1d752843a836ae3a63768d4a
2018-01-10 20:39:44 +00:00
Android Build Merger (Role)
0fe0808a01 Merge changes from topic "am-177bacee3d764303895ed5e1e72bf859" into oc-dev am: 2f8017a25a am: 5af7a7290f
am: 09f933b601

Change-Id: I93f6940b389d1f75701ef3c5e3ce7877a71d9618
2018-01-10 20:39:31 +00:00
Adam Vartanian
e1e9960037 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 am: e104b8132d -s ours
am: afbc49ee96

Change-Id: I8596849988ad71dbc0227efdf0bd8728c516eaba
2018-01-10 20:37:25 +00:00
Adam Vartanian
fe6272b12e 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 am: 9dcd9abb3e
am: b33a9da44e

Change-Id: I600432be7175660b15ca534d37a8f6d74e0ca947
2018-01-10 20:37:02 +00:00
Android Merger
9426ada6fd Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev am: afff62b0b9 am: f2b8d031ab am: 0be73f463a
am: 91e08510b1

Change-Id: Iade4494707b66e92989587b5cfb6be89e001d59c
2018-01-10 20:34:52 +00:00
Adam Vartanian
7666fbb478 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
am: 6329a0e2ae

Change-Id: Id9c6293718ad177e0c908df27a554c9f82f3b360
2018-01-10 20:32:02 +00:00
Adam Vartanian
03782ea6ef 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: ec320be2b3 am: 2ef4392dc8
am: ddd7efeef4

Change-Id: I545a809a12349d5fde77a17526ba1772bf8fb2d1
2018-01-10 20:30:07 +00:00
Android Merger
7071758bd8 Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4 am: a463421450 am: 983bd08331 am: 178f67f69d
am: a88a1fed27

Change-Id: I309be2935d5001a107507a36adff25d97c6c5a8c
2018-01-10 20:25:40 +00:00
Android Build Merger (Role)
09f933b601 Merge changes from topic "am-177bacee3d764303895ed5e1e72bf859" into oc-dev am: 2f8017a25a
am: 5af7a7290f

Change-Id: I49efdb80338f5a1638e4a147d33c73892ddff957
2018-01-10 20:25:34 +00:00
Adam Vartanian
b33a9da44e 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
am: 9dcd9abb3e

Change-Id: I03e9ef4c6eabdb0466728358342a45b29f5eb313
2018-01-10 20:23:36 +00:00
Android Build Merger (Role)
1f8146c8f0 Merge changes from topic "am-fda3e51b99ba472293e34273b3249d2c" into oc-mr1-dev-plus-aosp
* changes:
  Merge changes from topic "am-4a80c23f3c6c420e98f1331a523bf986" am: 7aa66922dd am: 3d5a649ea6
  DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 7955a4e8d8  -s ours am: d89f75a3db  -s ours am: db4ab12068  -s ours am: 7c6875bef1
2018-01-10 20:20:52 +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
Android Merger
91e08510b1 Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev am: afff62b0b9 am: f2b8d031ab
am: 0be73f463a

Change-Id: Ic622460d69e9971959605582c24ef385618f186e
2018-01-10 20:17:20 +00:00
Android Merger
9595c5bda0 Merge changes from topic "am-4a80c23f3c6c420e98f1331a523bf986" am: 7aa66922dd
am: 3d5a649ea6

Change-Id: Ia8f8e4beff5a291d0446cfe823daab08f8e624ee
2018-01-10 20:16:40 +00:00
Android Merger
594221b7ba Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev am: d9aadde604 am: b14f56b2c3 am: 63721f94a0
am: 85e2fc4b45

Change-Id: I0abe7a43f797f25673a48475eb24972485b52e5d
2018-01-10 20:15:42 +00:00
Android Build Merger (Role)
5af7a7290f Merge changes from topic "am-177bacee3d764303895ed5e1e72bf859" into oc-dev
am: 2f8017a25a

Change-Id: Ifd8d134ac97ba7138118a2b56bf08f2befc4083a
2018-01-10 20:15:28 +00:00
Adam Vartanian
626d5efb37 DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours am: d89f75a3db -s ours am: db4ab12068 -s ours
am: 7c6875bef1

Change-Id: Ide06fd43446570e000aab6d68eef95f2f98e8bf7
2018-01-10 20:13:14 +00:00
Adam Vartanian
ddd7efeef4 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: ec320be2b3
am: 2ef4392dc8

Change-Id: I498193553e12829caa562aa8813325728c4dd9a3
2018-01-10 20:13:12 +00:00
Adam Vartanian
fb6a84fe87 DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: df249cbcbb -s ours am: 2ff1dfc44f am: 90ee516098
am: 59942f6f77

Change-Id: I395b0060e6aff8dc0031f04c3991c03f2bc3c30e
2018-01-10 20:05:10 +00:00
Android Merger
85e2fc4b45 Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev am: d9aadde604 am: b14f56b2c3
am: 63721f94a0

Change-Id: I9277354d4b5761281c30581603023485a8808dc6
2018-01-10 20:02:33 +00:00
Android Merger
0be73f463a Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev am: afff62b0b9
am: f2b8d031ab

Change-Id: I0e178fbccc30a10fcac731edb427a282d9ce131d
2018-01-10 20:02:04 +00:00
Android Merger
89e39e7fd2 Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f0 am: 1858de921d am: 239831c86b
am: 416375dd21

Change-Id: Ia87ed49c075cfc939929517aaa04fdcd9928d23f
2018-01-10 19:59:50 +00:00
Adam Vartanian
59942f6f77 DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: df249cbcbb -s ours am: 2ff1dfc44f
am: 90ee516098

Change-Id: I7fc9142fd24fd07b420dcc8ca013253b3106cd98
2018-01-10 19:58:43 +00:00
Adam Vartanian
2ef4392dc8 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: ec320be2b3

Change-Id: I372e3e106968586e4dc2592cc5bf872be31960e7
2018-01-10 19:57:49 +00:00
Android Merger
c660e3c3f2 Merge changes from topic "am-a5bc4e54a433400f95783af4f8ba4da2"
* changes:
  Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev am: 105ca148a7
  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
2018-01-10 19:56:41 +00:00
Android Merger
d813e180f6 Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev
am: 105ca148a7

Change-Id: Iac57e88088eeb4a12c52e383c33a11a4a30adb1a
2018-01-10 19:56:14 +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
2181876b7e 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: I49b152f261ea580aea41eb846ca0239520afc16f
2018-01-10 19:48:38 +00:00
Android Merger
63721f94a0 Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev am: d9aadde604
am: b14f56b2c3

Change-Id: I2aa58504d0856a381f34a1febd9bcb380950acc1
2018-01-10 19:48:22 +00:00
Android Merger
416375dd21 Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f0 am: 1858de921d
am: 239831c86b

Change-Id: I38249d4841d8750aba9c3900edce8fce473e8e65
2018-01-10 19:47:54 +00:00
Adam Vartanian
19181ad787 DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours am: 7ae5d30389 am: eb7c20df71
am: 09c18b79e0

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

Change-Id: Ia986f28e8de96ef1776f9c919321646862e37323
2018-01-10 19:43:50 +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
420c69b8a1 Merge changes from topic "am-19e9244725df4b0eb80716c24e59ab9c"
* changes:
  Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev am: dedfb2ca1f
  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
2018-01-10 19:40:33 +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
Android Merger
ec3e88577f Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev
am: dedfb2ca1f

Change-Id: I7072dfc37d644226d37689f4313ecf0ea19f7c28
2018-01-10 19:40:09 +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