Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
cts
/
d69cf36971f4d5802456ae9d30756931c705d3ae
d69cf36
Skip the test that involves setting a launcher on work profile.
by Makoto Onuki
· 6 years ago
214749d
Merge "Don't complain if non-public libraries in subdirectories can be loaded." am: c08b75a063 am: 11c67de4a7
by Martin Stjernholm
· 6 years ago
0ca3eed
Merge "Don't complain if non-public libraries in subdirectories can be loaded." am: c08b75a063
by Martin Stjernholm
· 6 years ago
11c67de
Merge "Don't complain if non-public libraries in subdirectories can be loaded."
by Martin Stjernholm
· 6 years ago
c08b75a
Merge "Don't complain if non-public libraries in subdirectories can be loaded."
by Martin Stjernholm
· 6 years ago
3980cd6
Merge "Test Canvas#drawVertices"
by Leon Scroggins
· 6 years ago
abc07c1
Merge changes from topic "NDK DNS API CTS" am: 0e45542141 am: b0ae142232
by Luke Huang
· 6 years ago
55fd4fd
Merge changes from topic "NDK DNS API CTS" am: 0e45542141 am: b0ae142232
by Luke Huang
· 6 years ago
b0ae142
Merge changes from topic "NDK DNS API CTS" am: 0e45542141
by Luke Huang
· 6 years ago
1308ff8
Merge "SQLiteDatabaseTest: Remove test for compatibility WAL config."
by Narayan Kamath
· 6 years ago
f26f666
Merge "BgetScaledMinScalingSpan -> getScaledMinimum..."
by TreeHugger Robot
· 6 years ago
0e45542
Merge changes from topic "NDK DNS API CTS"
by Luke Huang
· 6 years ago
7b4dd86
Merge "Add Session2Token#getExtras()"
by Hyundo Moon
· 6 years ago
4ecbbd8
Merge "Run uirendering tests for changes to these tests."
by Aurimas Liutikas
· 6 years ago
9440ea4
Merge "Signature tests gather ancestor interfaces" am: 5ce37b23bf am: 37d799289a
by Jiyong Park
· 6 years ago
241bbd3
Merge "Signature tests gather ancestor interfaces" am: 5ce37b23bf am: 37d799289a
by Jiyong Park
· 6 years ago
37d7992
Merge "Signature tests gather ancestor interfaces" am: 5ce37b23bf
by Jiyong Park
· 6 years ago
5ce37b2
Merge "Signature tests gather ancestor interfaces"
by Treehugger Robot
· 6 years ago
5e98011
Signature tests gather ancestor interfaces
by Jiyong Park
· 6 years ago
123ff92
Merge "Backfill OWNERS for CTS module CtsProtoTestCases"
by TreeHugger Robot
· 6 years ago
c5ccf5e
Merge "Add cts test."
by Xiangyu/Malcolm Chen
· 6 years ago
49c3742
Merge "Add a test to cover StorageManager.mkdirs()."
by Sudheer Shanka
· 6 years ago
b32012a
Merge "Enable instant for CtsSharedLibsApiSignatureTestCases" am: 7cd5d7d51a am: a87bc3cd9a
by Sundong Ahn
· 6 years ago
e700bdb
Merge "Enable instant for CtsSharedLibsApiSignatureTestCases" am: 7cd5d7d51a
by Sundong Ahn
· 6 years ago
a87bc3c
Merge "Enable instant for CtsSharedLibsApiSignatureTestCases" am: 7cd5d7d51a
by Sundong Ahn
· 6 years ago
7cd5d7d
Merge "Enable instant for CtsSharedLibsApiSignatureTestCases"
by Treehugger Robot
· 6 years ago
43cc5c2
Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier version to 9.0_r8" into pie-cts-dev am: 4d9e676e18 -s ours am: c09c470bdc -s ours am: ab3c2df21c -s ours
by agowdra
· 6 years ago
f314d7a
[automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier version to 9.0_r8" into pie-cts-dev am: 4d9e676e18 -s ours am: 9695b2affd
by agowdra
· 6 years ago
325c230
Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier version to 9.0_r8" into pie-cts-dev am: 4d9e676e18 -s ours am: c09c470bdc -s ours
by agowdra
· 6 years ago
de35836
Merge "Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am: 5b01f188e1 -s ours am: ae698afa57 -s ours am: 83c83188fe -s ours am: 718ebd88aa -s ours am: 52055f0178 -s ours am: e80ebb764c -s ours
by agowdra
· 6 years ago
d3d75d9
Merge "Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am: 5b01f188e1 -s ours am: ae698afa57 -s ours am: 83c83188fe -s ours am: 718ebd88aa -s ours am: 6273cd696d" into pi-dev-plus-aosp
by agowdra
· 6 years ago
7bf7718
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r19" into oreo-cts-dev am: 5837a4761c -s ours am: aec56e126b -s ours am: d326dc4d16 -s ours am: 58d795ef4f -s ours am: 2c8a083762 -s ours
by agowdra
· 6 years ago
ab3c2df
Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier version to 9.0_r8" into pie-cts-dev am: 4d9e676e18 -s ours
by agowdra
· 6 years ago
a2da63f
[automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier version to 9.0_r8" into pie-cts-dev am: 4d9e676e18 -s ours
by agowdra
· 6 years ago
3c137df
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.1_r15" into oreo-mr1-cts-dev am: 029baa7d06 -s ours am: 4253252aa4 -s ours am: 8afa4f674f -s ours am: 54ab9bf604 -s ours
by agowdra
· 6 years ago
1c3c0da
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r19" into oreo-cts-dev am: 5837a4761c -s ours am: aec56e126b -s ours am: d326dc4d16 -s ours am: 8b37f8ca5f
by agowdra
· 6 years ago
7ad5c6d
Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.1_r15" into oreo-mr1-cts-dev am: 029baa7d06 -s ours am: 4253252aa4 -s ours am: f522eadc61
by agowdra
· 6 years ago
9695b2a
[automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier version to 9.0_r8" into pie-cts-dev
by agowdra
· 6 years ago
bf63a52
Merge "Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am: 5b01f188e1 -s ours am: ae698afa57 -s ours am: 83c83188fe -s ours am: 718ebd88aa -s ours am: 52055f0178 -s ours
by agowdra
· 6 years ago
66244c6
Merge "Fixed autofill tests that broke when we added a resourceId to the root view of login-activity.xml"
by TreeHugger Robot
· 6 years ago
b4169d4
Merge "Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am: 5b01f188e1 -s ours am: ae698afa57 -s ours am: 83c83188fe -s ours am: 718ebd88aa -s ours am: 6273cd696d" into pi-dev-plus-aosp
by Android Build Merger (Role)
· 6 years ago
69c03b8
Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am: 5b01f188e1 -s ours am: ae698afa57 -s ours am: 83c83188fe -s ours am: 718ebd88aa -s ours
by agowdra
· 6 years ago
756c65f
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r19" into oreo-cts-dev am: 5837a4761c -s ours am: aec56e126b -s ours am: d326dc4d16 -s ours am: 58d795ef4f -s ours
by agowdra
· 6 years ago
7c0c943
Add cts test.
by Malcolm Chen
· 6 years ago
41ea417
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.1_r15" into oreo-mr1-cts-dev am: 029baa7d06 -s ours am: 4253252aa4 -s ours am: 8afa4f674f -s ours
by agowdra
· 6 years ago
c09c470
Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier version to 9.0_r8" into pie-cts-dev am: 4d9e676e18 -s ours am skip reason: subject contains skip directive"
by Android Merger
· 6 years ago
e1c5ee8
[automerger skipped] Merge "DO NOT MERGE: Bump CTS Verifier version to 9.0_r8" into pie-cts-dev
by agowdra
· 6 years ago
dd342be
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r19" into oreo-cts-dev am: 5837a4761c -s ours am: aec56e126b -s ours am: d326dc4d16 -s ours
by agowdra
· 6 years ago
dc48248
Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.1_r15" into oreo-mr1-cts-dev am: 029baa7d06 -s ours am: 4253252aa4 -s ours
by agowdra
· 6 years ago
e80ebb7
Merge "Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am: 5b01f188e1 -s ours am: ae698afa57 -s ours am: 83c83188fe -s ours am: 718ebd88aa -s ours
by agowdra
· 6 years ago
2c8a083
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r19" into oreo-cts-dev am: 5837a4761c -s ours am: aec56e126b -s ours am: d326dc4d16 -s ours
by agowdra
· 6 years ago
54ab9bf
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.1_r15" into oreo-mr1-cts-dev am: 029baa7d06 -s ours am: 4253252aa4 -s ours
by agowdra
· 6 years ago
4d9e676
Merge "DO NOT MERGE: Bump CTS Verifier version to 9.0_r8" into pie-cts-dev
by Treehugger Robot
· 6 years ago
6273cd6
Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am: 5b01f188e1 -s ours am: ae698afa57 -s ours am: 83c83188fe -s ours
by agowdra
· 6 years ago
8b37f8c
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r19" into oreo-cts-dev am: 5837a4761c -s ours am: aec56e126b -s ours
by agowdra
· 6 years ago
f522ead
Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.1_r15" into oreo-mr1-cts-dev am: 029baa7d06 -s ours
by agowdra
· 6 years ago
52055f0
Merge "Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am: 5b01f188e1 -s ours am: ae698afa57 -s ours am: 83c83188fe -s ours am: 718ebd88aa -s ours am skip reason: subject contains skip directive"
by Android Merger
· 6 years ago
db16c44
Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am: 5b01f188e1 -s ours am: ae698afa57 -s ours am: 83c83188fe -s ours
by agowdra
· 6 years ago
58d795e
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r19" into oreo-cts-dev am: 5837a4761c -s ours am: aec56e126b -s ours am: d326dc4d16 -s ours am skip reason: subject contains skip directive"
by Android Merger
· 6 years ago
c2f7da5
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r19" into oreo-cts-dev am: 5837a4761c -s ours am: aec56e126b -s ours
by agowdra
· 6 years ago
8afa4f6
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.1_r15" into oreo-mr1-cts-dev am: 029baa7d06 -s ours am: 4253252aa4 -s ours am skip reason: subject contains skip directive"
by Android Merger
· 6 years ago
da09c11
Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.1_r15" into oreo-mr1-cts-dev am: 029baa7d06 -s ours
by agowdra
· 6 years ago
732f024
Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r27" into nougat-mr1-cts-dev am: 9495ed5f6f -s ours am: 99636ab72a -s ours am: 1a942b7bcb -s ours am: 25ca4ae7bd -s ours am: e6dd4493ea -s ours am: 40b8181f44 -s ours
by agowdra
· 6 years ago
718ebd8
Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am: 5b01f188e1 -s ours am: ae698afa57 -s ours am: 83c83188fe -s ours am skip reason: subject contains skip directive" into pie-cts-dev
by Android Merger
· 6 years ago
9c7d27b
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am: 5b01f188e1 -s ours am: ae698afa57 -s ours
by agowdra
· 6 years ago
d5f5e39
Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r27" into nougat-mr1-cts-dev am: 9495ed5f6f -s ours am: 99636ab72a -s ours am: 1a942b7bcb -s ours am: 25ca4ae7bd -s ours am: e6dd4493ea -s ours
by agowdra
· 6 years ago
019abb5
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r27" into nougat-mr1-cts-dev am: 9495ed5f6f -s ours am: 99636ab72a -s ours am: 1a942b7bcb -s ours am: 25ca4ae7bd -s ours am: 2649cf26a1
by agowdra
· 6 years ago
83c8318
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am: 5b01f188e1 -s ours am: ae698afa57 -s ours am skip reason: subject contains skip directive" into oreo-mr1-cts-dev
by Android Merger
· 6 years ago
1eb6e24
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am: 5b01f188e1 -s ours
by agowdra
· 6 years ago
d326dc4
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r19" into oreo-cts-dev am: 5837a4761c -s ours am: aec56e126b -s ours am skip reason: subject contains skip directive" into pie-cts-dev
by Android Merger
· 6 years ago
f391731
Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r19" into oreo-cts-dev am: 5837a4761c -s ours
by agowdra
· 6 years ago
4253252
Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.1_r15" into oreo-mr1-cts-dev am: 029baa7d06 -s ours am skip reason: subject contains skip directive" into pie-cts-dev
by Android Merger
· 6 years ago
df78566
[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.1_r15" into oreo-mr1-cts-dev
by agowdra
· 6 years ago
a703d88
Backfill OWNERS for CTS module CtsProtoTestCases
by Yichun Li
· 6 years ago
ae698af
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am: 5b01f188e1 -s ours am skip reason: subject contains skip directive" into oreo-cts-dev
by Android Merger
· 6 years ago
ce0cf52
Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours
by agowdra
· 6 years ago
aec56e1
Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r19" into oreo-cts-dev am: 5837a4761c -s ours am skip reason: subject contains skip directive" into oreo-mr1-cts-dev
by Android Merger
· 6 years ago
34d998e
[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r19" into oreo-cts-dev
by agowdra
· 6 years ago
40b8181
Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r27" into nougat-mr1-cts-dev am: 9495ed5f6f -s ours am: 99636ab72a -s ours am: 1a942b7bcb -s ours am: 25ca4ae7bd -s ours
by agowdra
· 6 years ago
675cfe9
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r27" into nougat-mr1-cts-dev am: 9495ed5f6f -s ours am: 99636ab72a -s ours am: 1a942b7bcb -s ours am: 25ca4ae7bd -s ours
by agowdra
· 6 years ago
029baa7
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.1_r15" into oreo-mr1-cts-dev
by Treehugger Robot
· 6 years ago
5b01f18
Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am skip reason: subject contains skip directive" into nougat-mr1-cts-dev
by Android Merger
· 6 years ago
b17aca2
[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev
by agowdra
· 6 years ago
003f5c7
Merge "Merge "Merge "Merge "resolve merge conflicts of a00b291c5a4e9ba6058e2fb699ea575fce406574 to oreo-cts-dev" into oreo-cts-dev am: ba543c5ad0" into oreo-mr1-cts-dev am: fb52c11d4e" into pie-cts-dev am: 653a7d21ef" am: 09dc51ce50 am: ccc215148a
by Shimi Zhang
· 6 years ago
2649cf2
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r27" into nougat-mr1-cts-dev am: 9495ed5f6f -s ours am: 99636ab72a -s ours am: 1a942b7bcb -s ours
by agowdra
· 6 years ago
e6dd449
Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r27" into nougat-mr1-cts-dev am: 9495ed5f6f -s ours am: 99636ab72a -s ours am: 1a942b7bcb -s ours am: 25ca4ae7bd -s ours am skip reason: subject contains skip directive"
by Android Merger
· 6 years ago
5837a47
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r19" into oreo-cts-dev
by Treehugger Robot
· 6 years ago
e367873
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r27" into nougat-mr1-cts-dev am: 9495ed5f6f -s ours am: 99636ab72a -s ours am: 1a942b7bcb -s ours
by agowdra
· 6 years ago
aab6efb
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev
by Treehugger Robot
· 6 years ago
e7e9a3e
Add a test to cover StorageManager.mkdirs().
by Sudheer Shanka
· 6 years ago
25ca4ae
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r27" into nougat-mr1-cts-dev am: 9495ed5f6f -s ours am: 99636ab72a -s ours am: 1a942b7bcb -s ours am skip reason: subject contains skip directive" into pie-cts-dev
by Android Merger
· 6 years ago
e07c30e
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r27" into nougat-mr1-cts-dev am: 9495ed5f6f -s ours am: 99636ab72a -s ours
by agowdra
· 6 years ago
07d085c
Merge "Merge "Merge "Merge "resolve merge conflicts of a00b291c5a4e9ba6058e2fb699ea575fce406574 to oreo-cts-dev" into oreo-cts-dev am: ba543c5ad0" into oreo-mr1-cts-dev am: fb52c11d4e" into pie-cts-dev am: 653a7d21ef" am: 09dc51ce50
by Shimi Zhang
· 6 years ago
9679a4b
Merge "[automerger skipped] Merge "DO NOT MERGE Fix CTS test for getting proper display device information (i.e. DisplayDevice and display size) from the multiple display device." into pie-cts-dev am: b5c6644d68 -s ours am: 518d48e476 -s ours am: a61bb601c6 -s ours
by Mark Hong
· 6 years ago
1a942b7
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r27" into nougat-mr1-cts-dev am: 9495ed5f6f -s ours am: 99636ab72a -s ours am skip reason: subject contains skip directive" into oreo-mr1-cts-dev
by Android Merger
· 6 years ago
6d6d7f2
Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r27" into nougat-mr1-cts-dev am: 9495ed5f6f -s ours
by agowdra
· 6 years ago
f9ca3c6
Merge "[automerger skipped] Merge "DO NOT MERGE Fix CTS test for getting proper display device information (i.e. DisplayDevice and display size) from the multiple display device." into pie-cts-dev am: b5c6644d68 -s ours am: 518d48e476 -s ours
by Mark Hong
· 6 years ago
598d9f6
Merge "Merge "Merge "resolve merge conflicts of a00b291c5a4e9ba6058e2fb699ea575fce406574 to oreo-cts-dev" into oreo-cts-dev am: ba543c5ad0" into oreo-mr1-cts-dev am: fb52c11d4e" into pie-cts-dev am: 653a7d21ef am: 249ddee46f
by Shimi Zhang
· 6 years ago
ccc2151
Merge "Merge "Merge "Merge "resolve merge conflicts of a00b291c5a4e9ba6058e2fb699ea575fce406574 to oreo-cts-dev" into oreo-cts-dev am: ba543c5ad0" into oreo-mr1-cts-dev am: fb52c11d4e" into pie-cts-dev am: 653a7d21ef"
by Shimi Zhang
· 6 years ago
14e5b0d
[automerger skipped] Merge "DO NOT MERGE Fix CTS test for getting proper display device information (i.e. DisplayDevice and display size) from the multiple display device." into pie-cts-dev am: b5c6644d68 -s ours am: 4589fdaf5e
by Mark Hong
· 6 years ago
Next »