Commit Graph

2051 Commits

Author SHA1 Message Date
Ray Essick
c8b558b08f Merge "[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" into oc-dev am: 68dc050239
am: 6edfe17ca2

Change-Id: I19b5b17dbd213dd08432c20c1a54b2c1c70a7eb1
2018-04-09 18:46:00 -07:00
Ray Essick
3977adb530 [automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606 am: 9289660d76
am: d89cacb7bf

Change-Id: Iafd862995f1944bb56c5829a10dc8b997f941d2c
2018-04-09 18:41:41 -07:00
Ray Essick
6e3df95a86 [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 skipped: d033198a42 skipped: c550755e79 skipped: 27bbc3628e am: ce176b9ffc
am: 56927e7cae

Change-Id: I183ec019764bc32754825b33b9ed29edd16e23ad
2018-04-09 18:38:48 -07:00
Ray Essick
213fa5b1db [automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d am: 790a6f6d52 am: df21617fed
am: 14e18f9179

Change-Id: I7df6f22f99aba634b635c73d7221d242d46cf4a3
2018-04-09 18:15:47 -07:00
Ray Essick
bff76d3a93 [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 am: 096c85e4cf
am: 591f6ccb9c

Change-Id: I352ea2e10daeaece58dd03f8e129d1d838f49366
2018-04-09 18:13:15 -07:00
Ray Essick
255cbbc39c [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 am: a11caf34cc
am: 10bed1ef52

Change-Id: Iba19c21dfb4bdeff88c166eb7c34bcdb0fdcc8aa
2018-04-09 18:08:15 -07:00
Ray Essick
205a892ff5 [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 am: 4d4f3950b6
am: 06c461a30b

Change-Id: Ib2de287366bc0e717623270d646e3d03949e2afd
2018-04-09 18:05:18 -07:00
Ray Essick
6edfe17ca2 Merge "[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" into oc-dev
am: 68dc050239

Change-Id: If6bacdfd0aa41e6fa22dfc86c90607f5f4560230
2018-04-09 18:01:25 -07:00
Ray Essick
8101a1ba85 [automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444 am: 0c19a15081 am: fbc9d49796
am: 72405a1736

Change-Id: Ib79f8a690859b8fa6cc3d3a06cccf3d2d33e9ee4
2018-04-09 18:00:29 -07:00
Ray Essick
089012397b [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 am: d2e50eb968
am: 66ef84dac4

Change-Id: Ia816131e3315500353a1f930b20881041e7e3f84
2018-04-09 17:57:49 -07:00
Ray Essick
d89cacb7bf [automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606
am: 9289660d76

Change-Id: I928824447efd55a1426992b7c2443d5ac932f402
2018-04-09 17:56:53 -07:00
Ray Essick
0fae69ebd7 Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf am: 5b5f73c2e8
am: 37ca5b50e8

Change-Id: Iae252f3f444f11641ef92a39494c85f57566de2c
2018-04-09 17:55:16 -07:00
Ray Essick
56927e7cae [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 skipped: d033198a42 skipped: c550755e79 skipped: 27bbc3628e
am: ce176b9ffc

Change-Id: I9bae103b065f64519e4cc9a844b47af36e49c0a6
2018-04-09 17:54:49 -07:00
Ray Essick
14e18f9179 [automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d am: 790a6f6d52
am: df21617fed

Change-Id: Ic47dd0a300198bb02d4fbdf7f8d77a4b0eb2ab5b
2018-04-09 17:50:54 -07:00
Ray Essick
591f6ccb9c [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
am: 096c85e4cf

Change-Id: Ib2f1f30d361a9854505178b1504ca63a648a1e0a
2018-04-09 17:48:42 -07:00
Ray Essick
10bed1ef52 [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
am: a11caf34cc

Change-Id: Ie003213690a2ac4baf087857a8406abde342b90c
2018-04-09 17:45:03 -07:00
Ray Essick
06c461a30b [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
am: 4d4f3950b6

Change-Id: I04cf9cf4b0bb75e97c45ad4f2c3fe34b03281d75
2018-04-09 17:42:39 -07:00
Ray Essick
72405a1736 [automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444 am: 0c19a15081
am: fbc9d49796

Change-Id: Ia31c9e335262a173961abbeb1f573d342185e5d4
2018-04-09 17:38:19 -07:00
Ray Essick
6ae132c625 [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 am: c1a7ce019c
am: 7a3920dfa4

Change-Id: I284890418cc5fe265d261b4c2852ebb083a7d34c
2018-04-09 17:36:36 -07:00
Ray Essick
66ef84dac4 [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
am: d2e50eb968

Change-Id: Ic6167b5ab7a083acc7f76defd0e197e9fd159330
2018-04-09 17:36:24 -07:00
Android Build Merger (Role)
6e146b4699 Merge "Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev am: 16af42313d" into oc-mr1-dev 2018-04-10 00:34:26 +00:00
Android Build Merger (Role)
9d36da58e7 Merge "[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 am: b591008bc2 -s ours" into oc-mr1-dev 2018-04-10 00:34:22 +00:00
Ray Essick
77f5a846d9 Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev
am: 16af42313d

Change-Id: Ia6fafc0f95b4160da31f6015b59fc0ab79e766c6
2018-04-09 17:34:08 -07:00
Ray Essick
91014e8da2 Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev am: 7fc94d02ca
am: 52d573a044

Change-Id: I3b68aaa872313c0a9cf0506c7601648b85e32276
2018-04-09 17:33:53 -07:00
Ray Essick
37ca5b50e8 Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf
am: 5b5f73c2e8

Change-Id: Ic00da51c5525f934d640a100b3a8d1830e1c2db8
2018-04-09 17:33:40 -07:00
Ray Essick
644ce499bd [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
am: b591008bc2  -s ours

Change-Id: I78097d3fa74d50a0328a953230138e66beec29fc
2018-04-09 17:33:12 -07:00
Ray Essick
7a3920dfa4 [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
am: c1a7ce019c

Change-Id: If52d64e09d7b1570ed1f8b7e90e47b4e24f05956
2018-04-09 17:16:08 -07:00
Android Build Merger (Role)
68dc050239 Merge "[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" into oc-dev 2018-04-10 00:14:08 +00:00
Ray Essick
03a6e259da Merge changes from topic "asb-2018-04-o" into oreo-cts-dev am: 6977a333a5 am: 51fa4a4cc9
am: ee4732c77c

Change-Id: I2e1fcbab25ee2cc680250881308e8d4b9d01d96f
2018-04-09 17:13:24 -07:00
Ray Essick
52d573a044 Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev
am: 7fc94d02ca

Change-Id: Ic222e3a15f1aa60792a7befa6423e97d12c23fac
2018-04-09 17:13:22 -07:00
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
Ray Essick
c8781cfae4 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours am: 81c482bdd4
am: a208a33079

Change-Id: I23ce9a632344d83d34373f72082a9cfed99568bc
2018-04-09 17:10:51 -07:00
Android Build Merger (Role)
9289660d76 [automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606
Change-Id: If096ea0d5c073cecf2e8e22a59b102702a42a15c
2018-04-10 00:10:38 +00:00
Android Build Merger (Role)
1e1b2a7606 [automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5
Change-Id: I95c778fbe4453b8e89991af0fefce3b1fff52e40
2018-04-10 00:10:34 +00:00
Android Build Merger (Role)
afef57cad5 [automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89
Change-Id: Ic9741b09169ad6ad4c1c7874fd59c090f4111fc6
2018-04-10 00:10:30 +00:00
Android Build Merger (Role)
ce176b9ffc [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 skipped: d033198a42 skipped: c550755e79 skipped: 27bbc3628e
Change-Id: I5c8a8aa2a76cf62357d437385d907a4df9398a95
2018-04-10 00:10:05 +00:00
Android Build Merger (Role)
27bbc3628e [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 skipped: d033198a42 skipped: c550755e79
Change-Id: Ie28a51e1566ef41b05e6ff03c03129ada1a20c23
2018-04-10 00:10:02 +00:00
Android Build Merger (Role)
c550755e79 [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 skipped: d033198a42
Change-Id: Ib74134a9b610ec81c2dd0b428efadc955dfe032a
2018-04-10 00:09:58 +00:00
Ray Essick
1ce0bfba89 Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev
am: 8ef12d94da

Change-Id: I1ff3b3086d7890ed1691cdd2821c76680fd152c4
2018-04-09 17:09:35 -07:00
Ray Essick
ee4732c77c Merge changes from topic "asb-2018-04-o" into oreo-cts-dev am: 6977a333a5
am: 51fa4a4cc9

Change-Id: Id37c3ae5f707f8677ea5ece9d7a432604eb7dcb4
2018-04-09 17:06:44 -07:00
Ray Essick
d033198a42 [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: Ib90a3db2bb775bd0ba9024fdafd7f7b498c808f3
2018-04-09 17:05:38 -07:00
Android Merger
16af42313d Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147
  [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
2018-04-10 00:04:01 +00:00
Ray Essick
3cca65faac Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev
am: dbfdb95147

Change-Id: I2aea8818706cfa197efaccd62152c57d078de93c
2018-04-09 17:03:48 -07:00
Ray Essick
a208a33079 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours
am: 81c482bdd4

Change-Id: I7972a70982b229d91cd168b07fb4ae6102dd5cf9
2018-04-09 17:03:44 -07:00
Ray Essick
0dc9743ac1 Merge "Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1" into oc-dev am: f2aeff9120
am: e9a9daa81a

Change-Id: I9cd9af6893c182b58935d991aa6669b5f244de7d
2018-04-09 17:00:28 -07:00
Ray Essick
b591008bc2 [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: I53fee208998ce3d62bd58e5280c3cbbe147d8c45
2018-04-09 16:59:06 -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