Ray Essick
135f60ffa5
Merge changes from topic "am-ef41260469b74ed484092f80fc943840" into oc-mr1-dev am: 73a2c644b7
...
am: 9c147bd5d7
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
2018-04-09 19:14:40 -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
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
2018-04-09 18:52:47 -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
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
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
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
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
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
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: 16af42313dafb3e84599bafd18446f72b96b0354b591008bc2
2018-04-10 00:22:06 +00:00
Ray Essick
7b8e19fb76
Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev
...
am: 16af42313d
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
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
2018-04-09 17:14:34 -07:00
Ray Essick
bd51d01139
Merge changes from topic "am-2dd7b4ef33fc46ddac7eb3610aab4ec8" am: 1a07cdce11
...
am: cd3957ee75
Change-Id: Ic58bacb77b750307173fd8dfc6edaacd6126c454
2018-04-09 17:08:07 -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
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: dbfdb95147afb3e84599bafd18446f72b96b0354
2018-04-10 00:04:01 +00:00
Ray Essick
3cca65faac
Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev
...
am: dbfdb95147
2018-04-09 17:03:48 -07:00
Ray Essick
170d735f6e
[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: eba4cb5e97 -s ours
...
am: 75b1d37e37 -s ours
Change-Id: I2191222a56bf3642b742a6a880b692f57579001b
2018-04-09 17:02:22 -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
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
2018-04-09 16:59:06 -07:00
Android Merger
dbfdb95147
Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev
...
* changes:
Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94daafb3e84599bafd18446f
2018-04-09 23:51:21 +00:00
Ray Essick
793b437465
Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev
...
am: 8ef12d94da
2018-04-09 16:51:06 -07: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
2018-04-09 16:48:16 -07:00
Ray Essick
1c139d96ec
Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev am: 666f941b5a
...
am: 4f668aaf31
2018-04-09 16:46:49 -07:00
Ray Essick
e2fd86301a
[automerger] Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f am: f727768aa7 am: b5c3ab95a8 am: efcf101cf2 am: 23be4acd42
...
am: 1507393897
2018-04-09 16:44:57 -07:00
Android Merger
8ef12d94da
Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev
...
* changes:
Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968dafb3e84599
2018-04-09 23:43:56 +00:00
Ray Essick
dfc472585a
Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev
...
am: 1fd90c968d
2018-04-09 16:43:45 -07:00
Ray Essick
7f6143aba5
[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
2018-04-09 16:43:25 -07:00
Ray Essick
749e2c39a0
[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
2018-04-09 16:42:33 -07:00
Ray Essick
a0bc089548
Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev am: f5e53a396f
...
am: b5c3d08260
2018-04-09 16:41:52 -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
2018-04-09 16:41:51 -07:00
Ray Essick
ababc876d2
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ac5b691121 -s ours
...
am: 2a60c1ea48
2018-04-09 16:34:20 -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
2018-04-09 23:33:47 +00:00
Ray Essick
27fec8a834
Merge changes from topic "am-d40b1053bf0542f084ff203cf4297e08" am: 7f66d8d286
...
am: 618bbf146b
Change-Id: Ib90a5a7ca709fbb071a4563dc818c0b993ede2af
2018-04-09 16:33:45 -07:00
Ray Essick
bcd58bb50a
Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev
...
am: 7f0c5e7da8
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
Ray Essick
73b129ec13
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ac5b691121 -s ours am: d0ff8fbabb -s ours
...
am: 52211eb32f -s ours
Change-Id: I1832558dfd5d2a2b4f716a4d9d7db45c9ba25098
2018-04-09 16:30:39 -07:00
Ray Essick
1507393897
[automerger] Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f am: f727768aa7 am: b5c3ab95a8 am: efcf101cf2
...
am: 23be4acd42
2018-04-09 16:30:31 -07:00
Ray Essick
aa7ce42421
[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
2018-04-09 16:29:08 -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
Ray Essick
ba7829adb5
Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev
...
am: f095afee74
2018-04-09 16:25:32 -07:00
Ray Essick
75d237b3ac
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours
...
am: 26d4c1f151
2018-04-09 16:24:55 -07:00
Ray Essick
4f668aaf31
Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev
...
am: 666f941b5a
2018-04-09 16:19:21 -07:00
