Commit Graph

1912 Commits

Author SHA1 Message Date
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
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
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
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)
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
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
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
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
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
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
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
eb7c20df71 DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours
am: 7ae5d30389

Change-Id: I994db8bc76d71aabcd14acd4082d1d24d8971067
2018-01-10 19:30:01 +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
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
Android Merger
7aa66922dd Merge changes from topic "am-4a80c23f3c6c420e98f1331a523bf986"
* changes:
  Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev am: 36407c961d
  DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 7955a4e8d8  -s ours am: d89f75a3db  -s ours
2018-01-10 19:27:09 +00:00
Android Merger
90b129d44e Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev
am: 36407c961d

Change-Id: I16ebd986d9d762b0ae6920a4bc82574156eb228a
2018-01-10 19:26:44 +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
db4ab12068 DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours
am: d89f75a3db  -s ours

Change-Id: Ic80cd0c5b4661ce7b5f595ffa484e3afd8a3abde
2018-01-10 19:22:28 +00:00
Android Merger
36407c961d Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f0
  DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 7955a4e8d8  -s ours
2018-01-10 19:17:29 +00:00
Android Merger
599f3a3c3f Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
am: fa209394f0

Change-Id: I3fa858e8b4a2da17f89f544b1ca802de84909830
2018-01-10 19:17:04 +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
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
Adam Vartanian
d89f75a3db DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours
am: 7955a4e8d8  -s ours

Change-Id: If66b41e17d12e833e1b93a8104e88220852c77b0
2018-01-10 19:14:29 +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
Android Merger
fa209394f0 Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
* changes:
  Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996
  DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours
2018-01-10 19:11:25 +00:00
Adam Vartanian
f93369d103 Merge changes from topic "n1" into nougat-mr1-cts-dev
am: 76faaa3996

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

Change-Id: I41b3f407c0e7714b80e935fb7ae556a2558cd143
2018-01-10 19:10:30 +00:00
Android Merger
f59fbfb5a4 Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev
* changes:
  Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d
  DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours
2018-01-10 19:08:34 +00:00
Adam Vartanian
0aa1444c8e Merge changes from topic "n" into nougat-cts-dev
am: a220d6d27d

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

Change-Id: I1402f70414d6ba6b89224d37af32bbe47157d1b5
2018-01-10 19:07:26 +00:00
Treehugger Robot
76faaa3996 Merge changes from topic "n1" into nougat-mr1-cts-dev
* changes:
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE Add EffectBundleTest
  DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
  DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-10 19:06:35 +00:00
Treehugger Robot
a220d6d27d Merge changes from topic "n" into nougat-cts-dev
* changes:
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE Add EffectBundleTest
  DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
  DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-10 18:59:52 +00:00