Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
cts
/
122f2d229011f103577a05d0b66827773d2df76f
122f2d2
Merge "Mark EdgeEffectTests#testOnAbsorb() as @LargeTest" into oc-dev am: fc29bbd78c
by Aurimas Liutikas
· 8 years ago
61d3d44
Merge "Merge "Mark EdgeEffectTests#testOnAbsorb() as @LargeTest" into oc-dev am: fc29bbd78c am: 7e1ad2c26b" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
d88c3f5
Merge "Mark EdgeEffectTests#testOnAbsorb() as @LargeTest" into oc-dev am: fc29bbd78c
by Aurimas Liutikas
· 8 years ago
e5508eb
Merge "Merge "New Autofill tests:" into oc-dev am: 9cba9f12e2 am: e200b2c63e" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
677996b
Merge "New Autofill tests:" into oc-dev am: 9cba9f12e2 am: e200b2c63e
by Felipe Leme
· 8 years ago
730cf55
Merge "New Autofill tests:" into oc-dev am: 9cba9f12e2 am: 9c827e5886
by Felipe Leme
· 8 years ago
fca6cd0
Merge "Mark EdgeEffectTests#testOnAbsorb() as @LargeTest" into oc-dev
by Aurimas Liutikas
· 8 years ago
7e1ad2c
Merge "Mark EdgeEffectTests#testOnAbsorb() as @LargeTest" into oc-dev
by Aurimas Liutikas
· 8 years ago
e200b2c
Merge "New Autofill tests:" into oc-dev am: 9cba9f12e2
by Felipe Leme
· 8 years ago
9c827e5
Merge "New Autofill tests:" into oc-dev am: 9cba9f12e2
by Felipe Leme
· 8 years ago
fc29bbd
Merge "Mark EdgeEffectTests#testOnAbsorb() as @LargeTest" into oc-dev
by TreeHugger Robot
· 8 years ago
9cba9f1
Merge "New Autofill tests:" into oc-dev
by Felipe Leme
· 8 years ago
5c928ed
Merge "AudioSecurityTest: verify equalizer get parameter name" into nyc-dev am: bb4a78f661 am: b86930f533 -s ours am: e9c439f666 am: e89fdf77f9 am: 388ed534fb am: b7f9badc45
by Andy Hung
· 8 years ago
076f7f2
Merge "Merge "DO NOT MERGE ANYWHERE: bump cts for 201708 security public bulletin Bug:37328047 Change-Id: I488fb2e2f3cfcbe8f7645d10e8d532eb91fb519e" into nyc-dev am: ee89112359 -s ours am: fff2040f2f -s ours am: a95f351eb3 -s ours am: d44ae2a3da -s ours am: 24d892f86d -s ours" into oc-dev am: e9baf5ee7b -s ours
by tinazh
· 8 years ago
5913608
Merge "Merge "Ignore requests not coming from the CtsAutoFillServiceTestCases" into oc-dev am: 5be9bda337 am: 9434412d95" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
ef1e401
Merge "Ignore requests not coming from the CtsAutoFillServiceTestCases" into oc-dev am: 5be9bda337
by Felipe Leme
· 8 years ago
fac57f8
Merge "Merge "Test security vulnerability fix: Equalizer setParameter memory overflow" into klp-dev am: e3854b78e5 am: bb6d721f18 am: b2ee7ea55c am: 8c5f2ccec1 am: d6c231a1d8 am: b646b371c2 am: 91daed8aef am: 1ef1011655 am: e286ed459e am: df288fe6ca am: 975e00ffc8 am: 772abd9745 am: 2c0d58a037 am: af21963b35 am: ffe09c8920 am: 382dedb1d1 am: 02727b447f" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
bc65d25
Merge "Test security vulnerability fix: Equalizer setParameter memory overflow" into klp-dev am: e3854b78e5 am: bb6d721f18 am: b2ee7ea55c am: 8c5f2ccec1 am: d6c231a1d8 am: b646b371c2 am: 91daed8aef am: 1ef1011655 am: e286ed459e am: df288fe6ca am: 975e00ffc8 am: 772abd9745 am: 2c0d58a037 am: af21963b35 am: ffe09c8920 am: 382dedb1d1
by Ricardo Garcia
· 8 years ago
60e5b4f
Merge "AudioSecurityTest: verify equalizer get parameter name" into nyc-dev am: bb4a78f661 am: b86930f533 -s ours am: e9c439f666 am: e89fdf77f9 am: 388ed534fb am: b7f9badc45
by Andy Hung
· 8 years ago
db122ea
Merge "Merge "AudioSecurityTest: verify equalizer get parameter name" into lmp-dev am: 2afff1fe0a am: 4687854e89 am: a34357d15f am: 865e36eb2d am: b009759872 am: 4b1ee33f85 am: f36aa04052 -s ours am: 5e4e39cf3a am: 9a7a2aac99 am: a0492d9ac9 am: 8c5922332e am: 2d7334552a am: 1fe4959931 am: d9c1cee1ef" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
09763ef
Merge "Merge "Merge "DO NOT MERGE ANYWHERE: bump cts for 201708 security public bulletin Bug:37328047 Change-Id: I488fb2e2f3cfcbe8f7645d10e8d532eb91fb519e" into nyc-dev am: ee89112359 -s ours am: fff2040f2f -s ours am: a95f351eb3 -s ours am: d44ae2a3da -s ours am: 24d892f86d -s ours" into oc-dev am: e9baf5ee7b -s ours am: 36dc8c9870 -s ours" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
bbf6d55
Merge "AudioSecurityTest: verify equalizer get parameter name" into lmp-dev am: 2afff1fe0a am: 4687854e89 am: a34357d15f am: 865e36eb2d am: b009759872 am: 4b1ee33f85 am: f36aa04052 -s ours am: 5e4e39cf3a am: 9a7a2aac99 am: a0492d9ac9 am: 8c5922332e am: 2d7334552a am: 1fe4959931
by Andy Hung
· 8 years ago
cc5dc94
Merge "Merge "DO NOT MERGE ANYWHERE: bump cts for 201708 security public bulletin Bug:37328047 Change-Id: I488fb2e2f3cfcbe8f7645d10e8d532eb91fb519e" into nyc-dev am: ee89112359 -s ours am: fff2040f2f -s ours am: a95f351eb3 -s ours am: d44ae2a3da -s ours am: 24d892f86d -s ours" into oc-dev am: e9baf5ee7b -s ours
by tinazh
· 8 years ago
c8b6e75
Merge "StagefrightTest: add test for OOB write in sonivox. am: 0022ceef36 am: cabc120c5c am: 518a35be34 am: c19440f9fc am: eca22cb80b am: eafcd9dc9f am: eb44eddeec" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
bd2e695
Merge "Merge "Ignore requests not coming from the CtsAutoFillServiceTestCases" into oc-dev am: 5be9bda337 am: 1b62a461e0" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
1a26930
StagefrightTest: add test for OOB write in sonivox. am: 0022ceef36 am: cabc120c5c am: 518a35be34 am: c19440f9fc am: eca22cb80b am: eafcd9dc9f
by Wei Jia
· 8 years ago
4bad591
Merge "Ignore requests not coming from the CtsAutoFillServiceTestCases" into oc-dev am: 5be9bda337
by Felipe Leme
· 8 years ago
7cad2eb
Merge changes from topic 'am-ee41af0e76a3462283c50702eae6fcd5' into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
f2a47cf
Merge "AudioSecurityTest: verify equalizer get parameter name" into nyc-dev am: bb4a78f661 am: b86930f533 -s ours am: e9c439f666 am: e89fdf77f9 am: 388ed534fb
by Andy Hung
· 8 years ago
a985a78
Merge "AudioSecurityTest: verify equalizer get parameter name" into nyc-dev am: bb4a78f661 am: b86930f533 -s ours am: e9c439f666 am: e89fdf77f9 am: 388ed534fb
by Andy Hung
· 8 years ago
bce0bd7
Merge changes from topic 'am-6d94399fe9a54e68bb328faaf8347068' into marshmallow-cts-dev am: 2ce803790f am: 5d739c197a am: f9a98c827c am: 526223e004 am: 64377a9338 am: 638cccd6c8 am: 8df755521a am: 9f241e144b am: 534737dedb am: 1297bf4f10 am: dcdbf8e097
by Wei Jia
· 8 years ago
5cb368c
DO NOT MERGE: StagefrightTest: add test for bug 22771132 am: ecfa904f0a -s ours am: 6614f52c87 -s ours am: 4dd401fb40 am: 9562c164b7 am: 2e06f31734 am: 22e243cb2c -s ours am: 8f35a6a192 am: ba20b07304 am: 3fba45e163 am: be4f6fa7c5 am: 0f3811a730 -s ours am: 9d4ae78974
by Wei Jia
· 8 years ago
6012ae7c
Merge "Test security vulnerability fix: Equalizer setParameter memory overflow" into klp-dev am: e3854b78e5 am: bb6d721f18 am: b2ee7ea55c am: 8c5f2ccec1 am: d6c231a1d8 am: b646b371c2 am: 91daed8aef am: 1ef1011655 am: e286ed459e am: df288fe6ca am: 975e00ffc8 am: 772abd9745 am: 2c0d58a037 am: af21963b35 am: ffe09c8920 am: 382dedb1d1
by Ricardo Garcia
· 8 years ago
5af797e
Merge "Merge "DO NOT MERGE ANYWHERE: bump cts for 201708 security public bulletin Bug:37328047 Change-Id: I488fb2e2f3cfcbe8f7645d10e8d532eb91fb519e" into nyc-dev am: ee89112359 -s ours am: fff2040f2f -s ours am: a95f351eb3 -s ours am: d44ae2a3da -s ours am: 24d892f86d -s ours" into oc-dev
by tinazh
· 8 years ago
0070699
Merge "Merge "AudioSecurityTest: verify equalizer get parameter name" into lmp-dev am: 2afff1fe0a am: 4687854e89 am: a34357d15f am: 865e36eb2d am: b009759872 am: 4b1ee33f85 am: f36aa04052 -s ours am: 5e4e39cf3a am: 9a7a2aac99 am: a0492d9ac9 am: 8c5922332e am: 2d7334552a am: 1fe4959931 am: 184005e81e" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
79d66bf
Merge "AudioSecurityTest: verify equalizer get parameter name" into lmp-dev am: 2afff1fe0a am: 4687854e89 am: a34357d15f am: 865e36eb2d am: b009759872 am: 4b1ee33f85 am: f36aa04052 -s ours am: 5e4e39cf3a am: 9a7a2aac99 am: a0492d9ac9 am: 8c5922332e am: 2d7334552a am: 1fe4959931
by Andy Hung
· 8 years ago
6699f73
Merge "StagefrightTest: add test for OOB write in sonivox. am: 0022ceef36 am: cabc120c5c am: 518a35be34 am: c19440f9fc am: eca22cb80b am: eafcd9dc9f am: 1db9bb9b4e" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
9434412
Merge "Ignore requests not coming from the CtsAutoFillServiceTestCases" into oc-dev
by Felipe Leme
· 8 years ago
1cfe42d
Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours am: 034b4fe6b3 am: c905e844e1 am: 6ffd506feb am: e14e19968b -s ours am: 86932477bb am: 2056de0f29 am: 065e20ae8c am: c4a2d29821 am: 9ee582f644 -s ours am: 851299d7cd am: 1bff79f90f" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
dff0c07
StagefrightTest: add test for OOB write in sonivox. am: 0022ceef36 am: cabc120c5c am: 518a35be34 am: c19440f9fc am: eca22cb80b am: eafcd9dc9f
by Wei Jia
· 8 years ago
64cbdf4
Merge changes from topic 'am-8b9a764d5a6241e49fba891c591164c9' into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
3b07ecf
Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours am: 034b4fe6b3 am: c905e844e1 am: 6ffd506feb am: e14e19968b -s ours am: 86932477bb am: 2056de0f29 am: 065e20ae8c am: c4a2d29821 am: 9ee582f644 -s ours am: 851299d7cd
by tinazh
· 8 years ago
05809eb
Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours am: 0f230de217" into oc-dev-plus-aosp am: 4a8e84979b" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
c9417da
Merge changes from topic 'am-6d94399fe9a54e68bb328faaf8347068' into marshmallow-cts-dev am: 2ce803790f am: 5d739c197a am: f9a98c827c am: 526223e004 am: 64377a9338 am: 638cccd6c8 am: 8df755521a am: 9f241e144b am: 534737dedb am: 1297bf4f10 am: dcdbf8e097
by Wei Jia
· 8 years ago
02727b4
Merge "Test security vulnerability fix: Equalizer setParameter memory overflow" into klp-dev am: e3854b78e5 am: bb6d721f18 am: b2ee7ea55c am: 8c5f2ccec1 am: d6c231a1d8 am: b646b371c2 am: 91daed8aef am: 1ef1011655 am: e286ed459e am: df288fe6ca am: 975e00ffc8 am: 772abd9745 am: 2c0d58a037 am: af21963b35 am: ffe09c8920
by Ricardo Garcia
· 8 years ago
93a982d
Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours am: 0f230de217" into oc-dev-plus-aosp
by tinazh
· 8 years ago
1eb6534
Merge "Merge "resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 am: 522a5c1ce5" into oc-dev-plus-aosp am: 9e8605a845" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
109bc09
DO NOT MERGE: StagefrightTest: add test for bug 22771132 am: ecfa904f0a -s ours am: 6614f52c87 -s ours am: 4dd401fb40 am: 9562c164b7 am: 2e06f31734 am: 22e243cb2c -s ours am: 8f35a6a192 am: ba20b07304 am: 3fba45e163 am: be4f6fa7c5 am: 0f3811a730 -s ours am: 9d4ae78974
by Wei Jia
· 8 years ago
aa1c34b
Merge "resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 am: 522a5c1ce5" into oc-dev-plus-aosp
by Wei Jia
· 8 years ago
2f48369
Merge "resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 am: 522a5c1ce5 am: 8fe6058768" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
36dc8c9
Merge "Merge "DO NOT MERGE ANYWHERE: bump cts for 201708 security public bulletin Bug:37328047 Change-Id: I488fb2e2f3cfcbe8f7645d10e8d532eb91fb519e" into nyc-dev am: ee89112359 -s ours am: fff2040f2f -s ours am: a95f351eb3 -s ours am: d44ae2a3da -s ours am: 24d892f86d -s ours" into oc-dev
by tinazh
· 8 years ago
d9c1cee
Merge "AudioSecurityTest: verify equalizer get parameter name" into lmp-dev am: 2afff1fe0a am: 4687854e89 am: a34357d15f am: 865e36eb2d am: b009759872 am: 4b1ee33f85 am: f36aa04052 -s ours am: 5e4e39cf3a am: 9a7a2aac99 am: a0492d9ac9 am: 8c5922332e am: 2d7334552a
by Andy Hung
· 8 years ago
592a307
resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 am: 522a5c1ce5
by Wei Jia
· 8 years ago
d4a91f3
Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours am: 034b4fe6b3 am: c905e844e1 am: 6ffd506feb am: e14e19968b -s ours am: 86932477bb am: 2056de0f29 am: 065e20ae8c am: c4a2d29821 am: 9ee582f644 -s ours am: 851299d7cd am: dbcdfb24a2" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
1010509
Merge "Merge "Merge changes from topic 'cp' into marshmallow-cts-dev am: 87c36ca3d1 -s ours am: 69e7430907 am: 646da50e62 am: 0e6a03eaba am: 8c4b357952 -s ours am: bb5072ba82 am: 3cded17ed3 am: ed846bbda7 am: c0439b2c9f am: 7bd593acdd" into oc-dev am: 7b2cf1a085 am: 97b605fd75" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
32ac265
Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours am: 034b4fe6b3 am: c905e844e1 am: 6ffd506feb am: e14e19968b -s ours am: 86932477bb am: 2056de0f29 am: 065e20ae8c am: c4a2d29821 am: 9ee582f644 -s ours am: 851299d7cd
by tinazh
· 8 years ago
1b62a46
Merge "Ignore requests not coming from the CtsAutoFillServiceTestCases" into oc-dev
by Felipe Leme
· 8 years ago
0024c50
Merge "Merge changes from topic 'cp' into marshmallow-cts-dev am: 87c36ca3d1 -s ours am: 69e7430907 am: 646da50e62 am: 0e6a03eaba am: 8c4b357952 -s ours am: bb5072ba82 am: 3cded17ed3 am: ed846bbda7 am: c0439b2c9f am: 7bd593acdd" into oc-dev am: 7b2cf1a085
by Marco Nelissen
· 8 years ago
f8ea7e2
Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours am: 0f230de217 am: 14a1751c54" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
eb44edd
StagefrightTest: add test for OOB write in sonivox. am: 0022ceef36 am: cabc120c5c am: 518a35be34 am: c19440f9fc am: eca22cb80b
by Wei Jia
· 8 years ago
147f219
Merge "Merge "Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063" into oc-dev am: 5aba424710 am: e5a6c51fd8" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
4fd038b
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours am: 0f230de217
by tinazh
· 8 years ago
3688abf
Merge "Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063" into oc-dev am: 5aba424710
by Wei Jia
· 8 years ago
1b4e714
Merge "resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 am: 522a5c1ce5 am: 0fbe29ad2a" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
f84697a
Merge "Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063 am: 283ea8ff27 am: 1897b6e33f" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
71bc4f5
resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 am: 522a5c1ce5
by Wei Jia
· 8 years ago
fcb7a03
Merge "Test security vulnerability fix: Equalizer setParameter memory overflow" into klp-dev am: e3854b78e5 am: bb6d721f18 am: b2ee7ea55c am: 8c5f2ccec1 am: d6c231a1d8 am: b646b371c2 am: 91daed8aef am: 1ef1011655 am: e286ed459e am: df288fe6ca am: 975e00ffc8 am: 772abd9745 am: 2c0d58a037 am: af21963b35 am: ffe09c8920
by Ricardo Garcia
· 8 years ago
e416a25
Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063 am: 283ea8ff27
by Wei Jia
· 8 years ago
a3e0281
Merge "Merge changes from topic 'cp' into marshmallow-cts-dev am: 87c36ca3d1 -s ours am: 69e7430907 am: 646da50e62 am: 0e6a03eaba am: 8c4b357952 -s ours am: bb5072ba82 am: 3cded17ed3 am: ed846bbda7 am: c0439b2c9f am: 7bd593acdd" into oc-dev am: 7b2cf1a085
by Marco Nelissen
· 8 years ago
184005e
Merge "AudioSecurityTest: verify equalizer get parameter name" into lmp-dev am: 2afff1fe0a am: 4687854e89 am: a34357d15f am: 865e36eb2d am: b009759872 am: 4b1ee33f85 am: f36aa04052 -s ours am: 5e4e39cf3a am: 9a7a2aac99 am: a0492d9ac9 am: 8c5922332e am: 2d7334552a
by Andy Hung
· 8 years ago
dd82686
Merge changes from topic 'am-6d94399fe9a54e68bb328faaf8347068' into marshmallow-cts-dev am: 2ce803790f am: 5d739c197a am: f9a98c827c am: 526223e004 am: 64377a9338 am: 638cccd6c8 am: 8df755521a am: 9f241e144b am: 534737dedb am: 1297bf4f10
by Wei Jia
· 8 years ago
b4acebf
DO NOT MERGE: StagefrightTest: add test for bug 22771132 am: ecfa904f0a -s ours am: 6614f52c87 -s ours am: 4dd401fb40 am: 9562c164b7 am: 2e06f31734 am: 22e243cb2c -s ours am: 8f35a6a192 am: ba20b07304 am: 3fba45e163 am: be4f6fa7c5 am: 0f3811a730 -s ours
by Wei Jia
· 8 years ago
0a22c64
Merge "Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063" into oc-dev am: 5aba424710
by Wei Jia
· 8 years ago
1db9bb9
StagefrightTest: add test for OOB write in sonivox. am: 0022ceef36 am: cabc120c5c am: 518a35be34 am: c19440f9fc am: eca22cb80b
by Wei Jia
· 8 years ago
1bff79f
Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours am: 034b4fe6b3 am: c905e844e1 am: 6ffd506feb am: e14e19968b -s ours am: 86932477bb am: 2056de0f29 am: 065e20ae8c am: c4a2d29821 am: 9ee582f644 -s ours
by tinazh
· 8 years ago
6270b37
Merge changes from topic 'am-6d94399fe9a54e68bb328faaf8347068' into marshmallow-cts-dev am: 2ce803790f am: 5d739c197a am: f9a98c827c am: 526223e004 am: 64377a9338 am: 638cccd6c8 am: 8df755521a am: 9f241e144b am: 534737dedb am: 1297bf4f10
by Wei Jia
· 8 years ago
27c5a4f
Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063 am: 283ea8ff27
by Wei Jia
· 8 years ago
b7f9bad
Merge "AudioSecurityTest: verify equalizer get parameter name" into nyc-dev am: bb4a78f661 am: b86930f533 -s ours am: e9c439f666 am: e89fdf77f9
by Andy Hung
· 8 years ago
8def216
DO NOT MERGE: StagefrightTest: add test for bug 22771132 am: ecfa904f0a -s ours am: 6614f52c87 -s ours am: 4dd401fb40 am: 9562c164b7 am: 2e06f31734 am: 22e243cb2c -s ours am: 8f35a6a192 am: ba20b07304 am: 3fba45e163 am: be4f6fa7c5 am: 0f3811a730 -s ours
by Wei Jia
· 8 years ago
4a8e849
Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours am: 0f230de217" into oc-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
0ab7ff2
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours
by tinazh
· 8 years ago
9e8605a
Merge "resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 am: 522a5c1ce5" into oc-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
dbcdfb2
Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours am: 034b4fe6b3 am: c905e844e1 am: 6ffd506feb am: e14e19968b -s ours am: 86932477bb am: 2056de0f29 am: 065e20ae8c am: c4a2d29821 am: 9ee582f644 -s ours
by tinazh
· 8 years ago
f5d76cf
resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536
by Wei Jia
· 8 years ago
e9baf5e
Merge "Merge "DO NOT MERGE ANYWHERE: bump cts for 201708 security public bulletin Bug:37328047 Change-Id: I488fb2e2f3cfcbe8f7645d10e8d532eb91fb519e" into nyc-dev am: ee89112359 -s ours am: fff2040f2f -s ours am: a95f351eb3 -s ours am: d44ae2a3da -s ours am: 24d892f86d -s ours" into oc-dev
by Android Build Merger (Role)
· 8 years ago
5be9bda3
Merge "Ignore requests not coming from the CtsAutoFillServiceTestCases" into oc-dev
by TreeHugger Robot
· 8 years ago
48a50cf
Merge "DO NOT MERGE ANYWHERE: bump cts for 201708 security public bulletin Bug:37328047 Change-Id: I488fb2e2f3cfcbe8f7645d10e8d532eb91fb519e" into nyc-dev am: ee89112359 -s ours am: fff2040f2f -s ours am: a95f351eb3 -s ours am: d44ae2a3da -s ours
by tinazh
· 8 years ago
14a1751
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours
by tinazh
· 8 years ago
382dedb
Merge "Test security vulnerability fix: Equalizer setParameter memory overflow" into klp-dev am: e3854b78e5 am: bb6d721f18 am: b2ee7ea55c am: 8c5f2ccec1 am: d6c231a1d8 am: b646b371c2 am: 91daed8aef am: 1ef1011655 am: e286ed459e am: df288fe6ca am: 975e00ffc8 am: 772abd9745 am: 2c0d58a037 am: af21963b35
by Ricardo Garcia
· 8 years ago
8fe6058
resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536
by Wei Jia
· 8 years ago
0fbe29a
resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536
by Wei Jia
· 8 years ago
1fe4959
Merge "AudioSecurityTest: verify equalizer get parameter name" into lmp-dev am: 2afff1fe0a am: 4687854e89 am: a34357d15f am: 865e36eb2d am: b009759872 am: 4b1ee33f85 am: f36aa04052 -s ours am: 5e4e39cf3a am: 9a7a2aac99 am: a0492d9ac9 am: 8c5922332e
by Andy Hung
· 8 years ago
97b605f
Merge "Merge changes from topic 'cp' into marshmallow-cts-dev am: 87c36ca3d1 -s ours am: 69e7430907 am: 646da50e62 am: 0e6a03eaba am: 8c4b357952 -s ours am: bb5072ba82 am: 3cded17ed3 am: ed846bbda7 am: c0439b2c9f am: 7bd593acdd" into oc-dev
by Marco Nelissen
· 8 years ago
0045aa2
Merge "Merge changes from topic 'cp' into marshmallow-cts-dev am: 87c36ca3d1 -s ours am: 69e7430907 am: 646da50e62 am: 0e6a03eaba am: 8c4b357952 -s ours am: bb5072ba82 am: 3cded17ed3 am: ed846bbda7 am: c0439b2c9f am: 7bd593acdd" into oc-dev
by Marco Nelissen
· 8 years ago
eafcd9d
StagefrightTest: add test for OOB write in sonivox. am: 0022ceef36 am: cabc120c5c am: 518a35be34 am: c19440f9fc
by Wei Jia
· 8 years ago
dabc077
Merge "Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063" into oc-dev
by Wei Jia
· 8 years ago
e5a6c51
Merge "Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063" into oc-dev
by Wei Jia
· 8 years ago
dcdbf8e
Merge changes from topic 'am-6d94399fe9a54e68bb328faaf8347068' into marshmallow-cts-dev am: 2ce803790f am: 5d739c197a am: f9a98c827c am: 526223e004 am: 64377a9338 am: 638cccd6c8 am: 8df755521a am: 9f241e144b am: 534737dedb
by Wei Jia
· 8 years ago
7fb0447
Merge "Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours" into nougat-cts-dev am: a6d0d0df20 -s ours" into nyc-dev am: d037411fb7 am: fd9f3b450c am: 2c0062c254 am: 8187f2f84f am: dc08cbf649 -s ours am: aa4dff61c2 am: d9759753b9" into oc-dr1-dev-plus-aosp
by Android Build Merger (Role)
· 8 years ago
eceb0b8
Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063
by Wei Jia
· 8 years ago
Next »