Commit Graph

1677 Commits

Author SHA1 Message Date
Ray Essick
5967d48708 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours
am: 72b96b0354  -s ours

Change-Id: I76249d018adb0f547a47dfcd18c3a161e028f4ee
2018-04-09 17:12:59 -07:00
Android Build Merger (Role)
df21617fed [automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d am: 790a6f6d52
Change-Id: I27f46c383d9ca5760aa4d15ff6823626ca3e0a92
2018-04-09 23:58:08 +00:00
Android Build Merger (Role)
790a6f6d52 [automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d
Change-Id: I6a578e4e3c63f23263fcabfa11859bcb30f10aaa
2018-04-09 23:58:04 +00:00
Android Build Merger (Role)
010e44479d [automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c
Change-Id: I8e84f13cf6f8f31ad96562acfce7d503b6b73304
2018-04-09 23:58:00 +00:00
Android Build Merger (Role)
02cf01f51c [automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5
Change-Id: Iea5d02461fb181773d87e87cecae8ebd7fa4dfe3
2018-04-09 23:57:55 +00:00
Android Build Merger (Role)
c2f39f64b5 [automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e
Change-Id: If5d1bb2ea504d9ca25a661e49eeb68274e02735c
2018-04-09 23:57:51 +00:00
Android Build Merger (Role)
096c85e4cf [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588 skipped: 63eae3a9e1 skipped: 1a158af55d
Change-Id: I8dc0cbf8fa692044f8faf89caeb376f4cd3fdff7
2018-04-09 23:57:09 +00:00
Android Build Merger (Role)
1a158af55d [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588 skipped: 63eae3a9e1
Change-Id: Ifd91317fdfdb04e1e871cacb85eaacb056ecc5bf
2018-04-09 23:57:06 +00:00
Android Build Merger (Role)
63eae3a9e1 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588
Change-Id: I66b017a380139a43f5c6fad8e86b69509f1cb834
2018-04-09 23:57:01 +00:00
Android Build Merger (Role)
8b6d971588 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea
Change-Id: If7186d1a551c931e37ce6481f60bff81ffc3ba9f
2018-04-09 23:56:58 +00:00
Android Build Merger (Role)
a4cf60e6ea [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d
Change-Id: Iac9c8c8265809970e40abcdeb1600db0bd537df2
2018-04-09 23:56:54 +00:00
Ray Essick
e451b4062e Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev
am: 1fd90c968d

Change-Id: I419475c5ec1b574b27e3886e8b814896b052e338
2018-04-09 16:56:40 -07:00
Ray Essick
868997117d [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours
am: afb3e84599  -s ours

Change-Id: If2935b3a343ee90d21992e50f2f6a3d8e698fa39
2018-04-09 16:54:52 -07:00
Android Build Merger (Role)
a11caf34cc [automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf am: c5c83b10ac am: 41c0a7b438
Change-Id: I80cce468813cad4e8cbd49e8971e38be03440784
2018-04-09 23:49:16 +00:00
Android Build Merger (Role)
41c0a7b438 [automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf am: c5c83b10ac
Change-Id: Ied035b45458a143f3c9fd7fb20aa8f658418034b
2018-04-09 23:49:12 +00:00
Android Build Merger (Role)
c5c83b10ac [automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf
Change-Id: I5aab9ff7ac9f7fa424e2608dcaba77e2b2916dbb
2018-04-09 23:49:08 +00:00
Android Build Merger (Role)
d27bde6edf [automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5
Change-Id: I8293081120821576357af0be19381165591881ec
2018-04-09 23:49:04 +00:00
Android Build Merger (Role)
c4691f5ad5 [automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc
Change-Id: I6c2503296ecba421bd2da55ff5f3fbe816df9de4
2018-04-09 23:49:01 +00:00
Android Build Merger (Role)
c0ca2003bc [automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f
Change-Id: I41f38c1c453af0ee29016cb1dd8fcf391a7563eb
2018-04-09 23:48:56 +00:00
Android Build Merger (Role)
70171fe46e [automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb
Change-Id: I3d0bb181be9a6850c04c414c00caa34357af64c2
2018-04-09 23:48:48 +00:00
Ray Essick
72b96b0354 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours
am: bafd18446f  -s ours

Change-Id: I32d61ceb0610ed88bfeb574624e6df0a655bd458
2018-04-09 16:48:16 -07:00
Android Build Merger (Role)
4d4f3950b6 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865 skipped: cd9a559fd2 skipped: 853c5 skipped: c26ea26d31
Change-Id: I761a5fd86f889777d4c862a9e42f8b098ed122ca
2018-04-09 23:47:29 +00:00
Android Build Merger (Role)
c26ea26d31 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865 skipped: cd9a559fd2 skipped: f283bb8132
Change-Id: Ic604614e4f886489429b0fd86f4432613b0e31a4
2018-04-09 23:47:26 +00:00
Android Build Merger (Role)
f283bb8132 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865 skipped: cd9a559fd2
Change-Id: Ic967955d3b681c9ac46e13ebd9ba472b5785a28e
2018-04-09 23:47:22 +00:00
Android Build Merger (Role)
cd9a559fd2 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865
Change-Id: I86e659f378ea19e8214b48018660f1aaa9e25452
2018-04-09 23:47:19 +00:00
Android Build Merger (Role)
973a5cd865 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5
Change-Id: I9aa2873c7effd36f674820e9360295037f245d5d
2018-04-09 23:47:16 +00:00
Android Build Merger (Role)
6fc9eb97c5 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b
Change-Id: I6eddf6d473cbc1a4c9aa622b28cd147d3d5ce354
2018-04-09 23:47:09 +00:00
Android Build Merger (Role)
bbfa5d23a9 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384
Change-Id: Iab81c84291e17c1124aa3e02f6a53515585a11e7
2018-04-09 23:47:01 +00:00
Ray Essick
6d52324524 Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev
am: 7f0c5e7da8

Change-Id: I78b882d59e9587efec84b735d48e58369764eba8
2018-04-09 16:46:34 -07:00
Ray Essick
151750d842 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: 2215338715  -s ours

Change-Id: Ie4d139a1eb1c5fc6506bb79861ffe81fed7c0157
2018-04-09 16:46:17 -07:00
Ray Essick
bafd18446f [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours
am: afb3e84599  -s ours

Change-Id: Iefbef63bc6c5cd09ce6b949f31e8a3fd8c822a15
2018-04-09 16:41:51 -07:00
Android Merger
1fd90c968d Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev
* changes:
  Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours
2018-04-09 23:33:47 +00:00
Ray Essick
bcd58bb50a Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev
am: 7f0c5e7da8

Change-Id: I1db217fe93ba600f5a732aa8418705f2133af020
2018-04-09 16:33:28 -07:00
Ray Essick
afb3e84599 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: 2215338715  -s ours

Change-Id: I9d60b68be04ed4f32a782ba09f406b2953f4938b
2018-04-09 16:33:05 -07:00
Treehugger Robot
7f0c5e7da8 Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev
* changes:
  DO NOT MERGE CTS for presence of avc fix for b/70897454
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE CTS additions for b/72165027
  DO NOT MERGE CTS tests for b/70897394
2018-04-09 23:26:06 +00:00
Android Build Merger (Role)
fbc9d49796 [automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444 am: 0c19a15081
Change-Id: Ic5b143f37eb1d0655f279e3b16630327e4694b50
2018-04-09 23:01:32 +00:00
Android Build Merger (Role)
0c19a15081 [automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444
Change-Id: If9bc5987bc69873e2e83f2f09e69c9717c87d92b
2018-04-09 23:01:29 +00:00
Android Build Merger (Role)
8c0df95444 [automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc
Change-Id: I535c691ff90da57c09e9c9072908e445846612d9
2018-04-09 23:01:26 +00:00
Android Build Merger (Role)
d2e50eb968 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb skipped: 849e67fad2
Change-Id: Id7d5a669fb0c542b6ab530e6c1930318c7c84ca2
2018-04-09 23:00:36 +00:00
Android Build Merger (Role)
849e67fad2 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb
Change-Id: Ib0b195b2f7635d26d467eb8a5669476cb21bc9a4
2018-04-09 23:00:24 +00:00
Android Build Merger (Role)
7a92b9afdb [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa
Change-Id: I624e926842a0e35b34e38e19e109d62653cb1e2a
2018-04-09 23:00:20 +00:00
Ray Essick
27b937e5fc Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev
am: 36b9badd7a

Change-Id: I95af41e36a50a3f83b53dda7348e3dfd1cf93d64
2018-04-09 15:59:56 -07:00
Ray Essick
5b5f73c2e8 Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev
am: 1c90ff8dcf

Change-Id: I0856e123ead2e4b075c693f68874354e51572988
2018-04-09 15:58:56 -07:00
Ray Essick
c1a7ce019c [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours
am: 308f60a04c  -s ours

Change-Id: Icdb4c482157fdff88c35ae2a92bc8ca92481b592
2018-04-09 15:57:47 -07:00
Ray Essick
1cdd92daaa [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours
am: 81f274ebb2  -s ours

Change-Id: If52edfd7ab1fa83debd3b1725b8e449f38017ad6
2018-04-09 15:57:27 -07:00
Android Build Merger (Role)
b27a56cf6f Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into nyc-mr2-dev
* changes:
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c am: 8c4e8c715d
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b skipped: 49581046e4 skipped: 4986062ed3
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b skipped: 49581046e4
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e
  Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours
2018-04-09 22:49:06 +00:00
Android Build Merger (Role)
ce6bd73430 Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into cw-f-dev
* changes:
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b skipped: 49581046e4
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e
  Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours
2018-04-09 22:49:06 +00:00
Android Build Merger (Role)
7fc94d02ca Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev
* changes:
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c am: 8c4e8c715d am: d23573db37
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c am: 8c4e8c715d
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b skipped: 49581046e4 skipped: 4986062ed3 skipped: 9b1b7bc603
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b skipped: 49581046e4 skipped: 4986062ed3
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b skipped: 49581046e4
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e
  Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours
2018-04-09 22:49:06 +00:00
Android Build Merger (Role)
b47089d6e3 Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into nyc-mr1-dev
* changes:
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e
  Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours
2018-04-09 22:49:06 +00:00
Ray Essick
51fa4a4cc9 Merge changes from topic "asb-2018-04-o" into oreo-cts-dev
am: 6977a333a5

Change-Id: Ic84f6809d553296ebf00f43c1bd64706f3992e22
2018-04-09 15:47:04 -07:00