Commit Graph

2468 Commits

Author SHA1 Message Date
Ray Essick
1dbf965ff8 [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
am: 99a753312a

Change-Id: I987de95482e006fb95e132af8eecb15c2ddfdcf4
2018-04-09 20:23:12 -07:00
Ray Essick
142c62b9e1 Merge "Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev am: 16af42313d" into oc-mr1-dev am: 6e146b4699
am: a2c6841c02

Change-Id: I85b6c8a445df3331d571a86db9d54f4c876cc13c
2018-04-09 20:20:07 -07:00
Ray Essick
e680cd3889 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
am: 7f390e3f77

Change-Id: Ia8371c0f97edb3f4389b2fe80910eaa5d9c63969
2018-04-09 20:16:01 -07:00
Ray Essick
d83ab7b222 Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev am: 7fc94d02ca am: 52d573a044 am: 91014e8da2
am: 9ca1b80cd2

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

Change-Id: I473ea09030991a610a4c26f5273b85e200ffdaeb
2018-04-09 20:09:05 -07:00
Ray Essick
26a6930fa3 [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
am: 62874f71ec

Change-Id: I76ef90f114d393dc8fc1d3ad42139551d22592bd
2018-04-09 20:06:05 -07:00
Ray Essick
138e67429a Merge "Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1" into oc-dev am: f2aeff9120 am: e9a9daa81a am: 0dc9743ac1
am: 991bdf22fe

Change-Id: Ib62681d498c607c49bd125af3055d3695fba7894
2018-04-09 20:03:12 -07:00
Ray Essick
572f2bf7ec 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
am: 67798ac557

Change-Id: If2cc83084ab9ceeefa8ad80650c8656bcabff584
2018-04-09 19:59:19 -07:00
Ray Essick
99eb8a471e Merge "Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev am: f0c2985ba8" into oc-mr1-dev am: 01a2073429
am: 888ba5ef93

Change-Id: Ib3f6d08653c953211cf0afa36e5f4ad3d02a6036
2018-04-09 19:51:18 -07:00
Ray Essick
82f4d79ef5 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
am: bff6860b2a

Change-Id: I749496c317a222957dd4c70d304e0f0d6fa249eb
2018-04-09 19:41:43 -07:00
Ray Essick
135f60ffa5 Merge changes from topic "am-ef41260469b74ed484092f80fc943840" into oc-mr1-dev am: 73a2c644b7
am: 9c147bd5d7

Change-Id: Ieb6f2c8780c37fb8060afb22adc0bb9493f2ba01
2018-04-09 19:18:11 -07:00
Ray Essick
7f8a0e9860 [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
am: 2001900f59

Change-Id: Iaa5877ba2f8968807f8b9583fda7ef93d2dcc579
2018-04-09 19:14:40 -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
3169e37e6c Merge "Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev am: f095afee74" into oc-mr1-dev am: ff27094d88
am: 076db23a54

Change-Id: I4f1f060af864dc8e381aa2a78873fcc75552f10d
2018-04-09 18:56:36 -07:00
Ray Essick
fe51f482f1 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
am: 1de9011e66

Change-Id: Icc9230e185b8286d3975b0129d11ee29410c0361
2018-04-09 18:52:47 -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
951282b56f Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev am: 666f941b5a am: 4f668aaf31
am: 1c139d96ec

Change-Id: I5f3d9c091a580c8149951a658a1b0a7b36378636
2018-04-09 18:19:34 -07:00
Android Build Merger (Role)
8fe7450448 Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours am: f3d4af802c -s ours am: 14b3dd4079 -s ours am: 7f6143aba5" into pi-dev-plus-aosp 2018-04-10 01:12:06 +00:00
Ray Essick
03edbe306e [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours am: f3d4af802c -s ours am: 14b3dd4079 -s ours
am: 7f6143aba5

Change-Id: Ib927d753d8315df79c5c3ffc9ef6aa4093a48515
2018-04-09 18:11:54 -07:00
Ray Essick
da02272c04 Merge changes from topic "am-d07fe6158f29422e98a40e093be6fb1d" am: 6c946d6275
am: 2139d17775

Change-Id: I5896ce2e4006f25a93866f4f74f46004eec9c345
2018-04-09 18:11:09 -07:00
Ray Essick
4ccba3e8a1 [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 am: 8cda702a5a -s ours
am: 8b83e5ce28  -s ours

Change-Id: I7f589a52ade3681f616e765c97462f5786def7e0
2018-04-09 18:07:17 -07:00
Ray Essick
1e7206f160 Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev am: f5e53a396f am: b5c3d08260
am: a0bc089548

Change-Id: Id21cc3d0b0a7b7bbb952df2821b744b4ebc07be4
2018-04-09 18:03:44 -07:00
Ray Essick
fe7d058185 Merge changes from topic "am-16b0b195e940437c988164c18e28c9c8" am: 2a559a04cd
am: 02c310f568

Change-Id: Ibfa12caa78f809e1588d9dd4640022a7d31b155f
2018-04-09 17:56:47 -07:00
Ray Essick
14a6b1c1ef [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 am: 2040949cb3 -s ours
am: 4aa69908c2  -s ours

Change-Id: Idb38e5cc4256b507785c78fc13c20314f52f276b
2018-04-09 17:52:43 -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
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
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
51587bee83 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ac5b691121 -s ours am: 2a60c1ea48 -s ours
am: ababc876d2

Change-Id: I97d8f91a6cfdcb4433ce70c903a45976c1a8bdc1
2018-04-09 17:23:23 -07:00
Android Merger
6c946d6275 Merge changes from topic "am-d07fe6158f29422e98a40e093be6fb1d"
* changes:
  Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev am: 16af42313d
  [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
2018-04-10 00:22:06 +00:00
Ray Essick
7b8e19fb76 Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev
am: 16af42313d

Change-Id: I7568d330852e6b103af5aca99619cda9cfefa8d8
2018-04-09 17:21:55 -07:00
Ray Essick
d208ddaa14 Merge changes from topic "am-d23ca51b7f164fc892e8bdfd6febf406" am: 52525a8839
am: 7ae46dad83

Change-Id: I068637a3734a63fe843d6add916653b4ff58dd8a
2018-04-09 17:21:49 -07:00
Ray Essick
416fa992a9 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours am: 26d4c1f151 -s ours am: 00eb32582d -s ours
am: af5b3958ae  -s ours

Change-Id: I9850b877597ce963d9bff29641673ae1333c8482
2018-04-09 17:18:18 -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
8cda702a5a [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: Id2cd89dae283270d5a88a7c42b0f2cbdc311e9a6
2018-04-09 17:14:34 -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