Commit Graph

1953 Commits

Author SHA1 Message Date
Adam Vartanian
64cc460be3 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
am: abf05416b9  -s ours

Change-Id: I278d057888e942fb626abfae7c6564a2bad19e1d
2018-01-10 21:52:20 +00:00
Android Build Merger (Role)
cc1115e12a Merge changes from topic "am-78d56b92e8374ea69d3020f927cd3a08" into oc-mr1-dev-plus-aosp
am: 11c9381256

Change-Id: I615649a3088b7ee39a722d2e801ddfb583b739fb
2018-01-10 21:49:15 +00:00
Adam Vartanian
3172d2da40 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
am: e1e9960037  -s ours

Change-Id: If0830639c913a960178d5357ec1b3dd1e118b674
2018-01-10 21:37:48 +00:00
Android Build Merger (Role)
ae11fd1d17 Merge changes from topic "am-177bacee3d764303895ed5e1e72bf859" into oc-dev am: 2f8017a25a am: 5af7a7290f am: 09f933b601
am: 0fe0808a01

Change-Id: I551f40409aed0a18e82500af15e912d0250b0545
2018-01-10 21:27:00 +00:00
Android Merger
6fd6f29cc9 Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev am: afff62b0b9 am: f2b8d031ab am: 0be73f463a am: 91e08510b1
am: 9426ada6fd

Change-Id: Idb5feb4cbbbc03ed65d3a9ff5106d187ca31270d
2018-01-10 21:21:52 +00:00
Adam Vartanian
fc2ff6635a 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
am: 03782ea6ef  -s ours

Change-Id: I8ac3b97a6af09df49086574c376e8bbc88b30f28
2018-01-10 21:17:19 +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)
af44c0c56b Merge changes from topic "am-fda3e51b99ba472293e34273b3249d2c" into oc-mr1-dev-plus-aosp
am: 1f8146c8f0

Change-Id: If5b23f50ff5324ad7ea0d244424a04ee63ca10d8
2018-01-10 20:53:49 +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
Adam Vartanian
5725d273c3 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
am: 626d5efb37  -s ours

Change-Id: I74e639824511ae90674b36aa1fe80f605a2b27a7
2018-01-10 20:43:43 +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 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
Android Merger
8fdd4e84ce Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev am: d9aadde604 am: b14f56b2c3 am: 63721f94a0 am: 85e2fc4b45
am: 594221b7ba

Change-Id: I8e15f0cce4eb0183d030698a8441b6e6986b53cb
2018-01-10 20:32:41 +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 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
525b854ebf 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
am: fb6a84fe87  -s ours

Change-Id: I1d23ad84760e9ea90895ee04756a0599f4299f41
2018-01-10 20:17:35 +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 Merger
d9e482a84b Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f0 am: 1858de921d am: 239831c86b am: 416375dd21
am: 89e39e7fd2

Change-Id: I8c63dd53a32558956130f95366c3bd3913859eb4
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
Adam Vartanian
cc09e944b6 DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours am: 7ae5d30389 am: eb7c20df71 am: 09c18b79e0
am: 19181ad787  -s ours

Change-Id: I2f1e1ed6ead90e8efc964a3bf44fa99914bd253e
2018-01-10 19:56:35 +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
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
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
Adam Vartanian
09c18b79e0 DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours am: 7ae5d30389
am: eb7c20df71

Change-Id: I0be9450ac48356351c11e532db821a8b0ef12fad
2018-01-10 19:39:05 +00:00
Android Merger
239831c86b Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f0
am: 1858de921d

Change-Id: Ib7210f7529d9c6dba5b601bd3e47dd612cc64598
2018-01-10 19:34:52 +00:00
Adam Vartanian
e104b8132d 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: I9ebe0964d0cd8777cff515a9083f6c808ce2542c
2018-01-10 19:34:37 +00:00