Commit Graph

2448 Commits

Author SHA1 Message Date
Ray Essick
e18b64e07f [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
am: 213fa5b1db

Change-Id: Ica7fb8d109c22c4f5ff9be80d0bea41e6d8b552e
2018-04-09 19:17:52 -07:00
Ray Essick
33586ec7c3 [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
am: bff76d3a93  -s ours

Change-Id: Ie689f7ee5fe7459eb21d742617a219391060fad5
2018-04-09 19:14:36 -07:00
Ray Essick
6cc16da2a9 [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
am: 255cbbc39c

Change-Id: I44d015880ab51ca2f3a8d56ab9fcfffa752583e4
2018-04-09 19:11:42 -07:00
Ray Essick
e6af30cb2c [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
am: 205a892ff5  -s ours

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

Change-Id: Idc7e17f08c59629680f30be28c056b14fa00228f
2018-04-09 19:06:17 -07:00
Ray Essick
6c3717661f [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
am: 089012397b  -s ours

Change-Id: I8115640bfa76cd2f245880afb901f354f98569fb
2018-04-09 19:03:03 -07:00
Ray Essick
2715d84585 Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf am: 5b5f73c2e8 am: 37ca5b50e8
am: 0fae69ebd7

Change-Id: Iae8c06a591d43e850ee5deacf9efaffc4bd2048e
2018-04-09 19:02:07 -07:00
Ray Essick
99a753312a [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
am: 6ae132c625  -s ours

Change-Id: Ic3853238342398a8ddc409c7a45c866eb1e58714
2018-04-09 18:58:24 -07:00
Ray Essick
a2c6841c02 Merge "Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev am: 16af42313d" into oc-mr1-dev
am: 6e146b4699

Change-Id: Ief4132902a45fe9d344105233e8119163afa4160
2018-04-09 18:57:24 -07:00
Ray Essick
7f390e3f77 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
am: 9d36da58e7  -s ours

Change-Id: I15ddd6c39cfe9b95c1a677685a0aa93c01856d16
2018-04-09 18:50:47 -07:00
Ray Essick
9ca1b80cd2 Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev am: 7fc94d02ca am: 52d573a044
am: 91014e8da2

Change-Id: Ib327df02fff8bf808663e0b960efa0ebf9445d51
2018-04-09 18:49:49 -07:00
Ray Essick
186dbad0df Merge changes from topic "asb-2018-04-o" into oreo-cts-dev am: 6977a333a5 am: 51fa4a4cc9 am: ee4732c77c
am: 03a6e259da

Change-Id: I0abec8285d7b28a3bd9190015cd42416a571f4ce
2018-04-09 18:46:06 -07:00
Ray Essick
62874f71ec [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours am: 81c482bdd4 am: a208a33079
am: c8781cfae4  -s ours

Change-Id: I33e6cd995c4dd44e5f2a2da606301b6a094c2c54
2018-04-09 18:43:17 -07:00
Ray Essick
991bdf22fe Merge "Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1" into oc-dev am: f2aeff9120 am: e9a9daa81a
am: 0dc9743ac1

Change-Id: I918d6def4a54a838c8358881cf06f941ee6d00bf
2018-04-09 18:42:12 -07:00
Ray Essick
67798ac557 Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours" into oc-dev am: 50988d78ff am: b4dde24b91
am: 9e863b8450  -s ours

Change-Id: I396fa8b81fc094b9b87d37835742bc9119e7a465
2018-04-09 18:37:42 -07:00
Ray Essick
888ba5ef93 Merge "Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev am: f0c2985ba8" into oc-mr1-dev
am: 01a2073429

Change-Id: I658bb749415a0d9fdf710d51c83d742abde2866d
2018-04-09 18:36:10 -07:00
Ray Essick
bff6860b2a Merge "[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: 3ace7af527 -s ours" into oc-mr1-dev
am: f893a5ace2  -s ours

Change-Id: Ic93c17bfb0ecfa4475c884fe951acf5750188952
2018-04-09 18:30:40 -07:00
Ray Essick
9c147bd5d7 Merge changes from topic "am-ef41260469b74ed484092f80fc943840" into oc-mr1-dev
am: 73a2c644b7

Change-Id: I2566fc1242d2b3c73e951e4fd30264a7439a8411
2018-04-09 18:29:13 -07:00
Ray Essick
2001900f59 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours skipped: d4d28bcb12 skipped: 948813147b skipped: 1cd8984784 am: 0c883452f2 am: aa7ce42421
am: 749e2c39a0  -s ours

Change-Id: I647ba112083610f0c586473c6230f674fe1887e5
2018-04-09 18:22:54 -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
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
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
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
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
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
Ray Essick
076db23a54 Merge "Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev am: f095afee74" into oc-mr1-dev
am: ff27094d88

Change-Id: I4f27af41d5d00bb679acd8237b9257b5717ef584
2018-04-09 17:07:09 -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
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
1de9011e66 Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours am: 26d4c1f151 -s ours" into oc-mr1-dev
am: 61b59aed96  -s ours

Change-Id: Ic894b491c4da4a3820ad461403b62bd2e8b19238
2018-04-09 17:00:02 -07:00