Commit Graph

2341 Commits

Author SHA1 Message Date
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
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
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
Ray Essick
9e863b8450 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

Change-Id: I244846e8cf2b86b295d6fd81de56f3a01c705378
2018-04-09 16:56:41 -07:00
Ray Essick
e9a9daa81a Merge "Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1" into oc-dev
am: f2aeff9120

Change-Id: I613122f6d0c51920809a22bd7adf47cfdfa48420
2018-04-09 16:48:06 -07:00
Android Build Merger (Role)
01a2073429 Merge "Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev am: f0c2985ba8" into oc-mr1-dev 2018-04-09 23:47:45 +00:00
Android Build Merger (Role)
f893a5ace2 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 2018-04-09 23:47:41 +00:00
Ray Essick
1a8b3d6ffc Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev
am: f0c2985ba8

Change-Id: I6cf85069a417a37db32e2bbab1720de6776afe25
2018-04-09 16:47:26 -07:00
Ray Essick
1c139d96ec Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev am: 666f941b5a
am: 4f668aaf31

Change-Id: I13e5bc319ccb23312d415da56e8d9e3db1eafde0
2018-04-09 16:46:49 -07:00
Ray Essick
97b4b1781e [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

Change-Id: I6535fac037e64685d3497646aa38bd8370403a72
2018-04-09 16:45: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

Change-Id: I6e94c7014e2ae8fe3d99520e9cb95b918e9bf586
2018-04-09 16:44:57 -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  -s ours

Change-Id: I5e5b9f0398fb34ba263bd5fbe9a4299bf0bd41f7
2018-04-09 16:43:25 -07:00
Ray Essick
b4dde24b91 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

Change-Id: Ie2fff0074dc2f486d434e3a433653d9bb7068e75
2018-04-09 16:43:17 -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

Change-Id: I649d54fb86aae841b9b0e5dafb6493e6823c1561
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

Change-Id: Id3a47db521327b32843cb68e6ff10b89f0f23828
2018-04-09 16:41:52 -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  -s ours

Change-Id: I35d5e215f55614c4bb549d6dc36034163cddc6e0
2018-04-09 16:34:20 -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

Change-Id: I52e0d6d57386c941d838db5d105e15d38a899b74
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

Change-Id: Iccc3be55c8dd75daf8c5184acfd67d5e6430d720
2018-04-09 16:29:08 -07:00
Ray Essick
ba7829adb5 Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev
am: f095afee74

Change-Id: I0d3c8f6eb580656405543377dc073ae116661bc7
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  -s ours

Change-Id: I9a1a7075f9df156541ff083469e9cd679dde2e6f
2018-04-09 16:24:55 -07:00
Ray Essick
4f668aaf31 Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev
am: 666f941b5a

Change-Id: I93160ff6bf44b8d186f86e0c54ea463df48dbfc5
2018-04-09 16:19:21 -07:00
Ray Essick
14b3dd4079 [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

Change-Id: Ie1ce0237b3eed4b170a4cf87e0387ce7aaac4673
2018-04-09 16:18:39 -07:00
Ray Essick
b5c3d08260 Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev
am: f5e53a396f

Change-Id: I03ecdfbb20e5b882332e7a018fed9b6969990974
2018-04-09 16:13:03 -07:00
Ray Essick
2a60c1ea48 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: ac5b691121  -s ours

Change-Id: I68bd2d8587558b601681d0a46b22c6f30cb9fa62
2018-04-09 16:12:37 -07:00
Android Merger
f0c2985ba8 Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf
  [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
2018-04-09 22:53:51 +00:00
Ray Essick
d9a966f2f9 Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev
am: 1c90ff8dcf

Change-Id: Ia6a800ccdc908776040c2d9b2a793fbdb2e174fc
2018-04-09 15:53:38 -07:00
Ray Essick
3ace7af527 [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: I2c54e0109d53efdeff69279f0c796d5bf103a58e
2018-04-09 15:48:01 -07:00
Android Build Merger (Role)
f2aeff9120 Merge "Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1" into oc-dev 2018-04-09 22:45:03 +00:00
Android Build Merger (Role)
50988d78ff 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 2018-04-09 22:44:57 +00:00
Ray Essick
85a85e7f60 Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev
am: 0eeb6c53d1

Change-Id: Icf7f366eaa4acfc637c34747af931d9486465595
2018-04-09 15:44:38 -07:00
Android Build Merger (Role)
23be4acd42 [automerger] Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f am: f727768aa7 am: b5c3ab95a8 am: efcf101cf2
Change-Id: Ia2a7b09dc5ea0e9ef306a2d9956a42d06363498d
2018-04-09 22:44:05 +00:00
Android Build Merger (Role)
b5c3ab95a8 [automerger] Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f am: f727768aa7
Change-Id: If7be053b905cd763f1aa7b50e5d4b1c91cb86255
2018-04-09 22:43:57 +00:00
Ray Essick
eb9dd8fcfd [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours
am: 8dd2d10a1b  -s ours

Change-Id: Ic32e80e3c05bed7890832c6d78eb559a22549006
2018-04-09 15:43:44 -07:00
Android Build Merger (Role)
0c883452f2 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours skipped: d4d28bcb12 skipped: 948813147b skipped: 1cd8984784
Change-Id: I4a4a7e805cde5a422b384b1887d0e0dff01b941d
2018-04-09 22:43:14 +00:00
Android Build Merger (Role)
948813147b [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours skipped: d4d28bcb12
Change-Id: Ibfa3a3e072b7003e602018aec609cba191138534
2018-04-09 22:42:52 +00:00
Ray Essick
f727768aa7 Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev
am: 34ef78f44f

Change-Id: Ibda5cebb569720eae6fa4001a774a13d99ebf04b
2018-04-09 15:42:22 -07:00
Ray Essick
d4d28bcb12 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: 8a0f955e56  -s ours

Change-Id: I0024538a8e58264b11b0573881e8c2e30191b3b2
2018-04-09 15:42:07 -07:00
Android Merger
f095afee74 Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "asb-2018-04-o" into oreo-cts-dev am: 6977a333a5
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f  -s ours
2018-04-09 22:39:44 +00:00
Ray Essick
12cc7ae103 Merge changes from topic "asb-2018-04-o" into oreo-cts-dev
am: 6977a333a5

Change-Id: I7c4d9e4ee3339a65bd7da67674d932813b588725
2018-04-09 15:39:30 -07:00
Ray Essick
26d4c1f151 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: ae91a6ad6f  -s ours

Change-Id: I07f5461359c0b0d810d90c8a208c2c9fa00e1413
2018-04-09 15:38:51 -07:00
Android Merger
666f941b5a Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56  -s ours am: 8dd2d10a1b  -s ours
2018-04-09 22:38:18 +00:00
Treehugger Robot
f5e53a396f Merge changes from topic "asb-2018-04-o1" into oreo-mr1-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
  DO NOT MERGE Camera: Add test for OutputConfiguration parcelling
2018-04-09 22:37:33 +00:00
Ray Essick
a0de7cb873 Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev
am: 0eeb6c53d1

Change-Id: I999d875a15b9a037165e4782f285a591334b4daf
2018-04-09 15:37:30 -07:00
Android Merger
1c90ff8dcf Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev
* changes:
  Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours am: 81f274ebb2  -s ours
2018-04-09 22:37:07 +00:00