1. ecad2c9 Merge "Fix file_contexts CTS tests" into oc-dev am: f2a905832a by Jeffrey Vander Stoep · 7 years ago
  2. f2a9058 Merge "Fix file_contexts CTS tests" into oc-dev by Jeffrey Vander Stoep · 7 years ago
  3. 292df36 Merge "CTS/STS test for Android Security b/36604779" into nyc-mr2-dev am: 8e7183ec4c by Andres Celis · 7 years ago
  4. 40c3f2b Merge "CTS/STS test for Android Security b/36604779" into nyc-mr2-dev by Andres Celis · 7 years ago
  5. 8e7183e Merge "CTS/STS test for Android Security b/36604779" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  6. dc03aa8 Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness again." into oc-dev by Sudheer Shanka · 7 years ago
  7. a0aa73e Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness again." into oc-dev by Sudheer Shanka · 7 years ago
  8. 9f626d6 Merge "Patch error in which --retry filters parameterized tests" into oc-dev by Aaron Holden · 7 years ago
  9. cbbcd81 Merge "Patch error in which --retry filters parameterized tests" into oc-dev by TreeHugger Robot · 7 years ago
  10. 39d24dd DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also adding all of the stagefright tests am: 9ca478dae2 am: 7f9fbb56a5 am: 5cab05e8b4 -s ours by Badash · 7 years ago
  11. f019c43 DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also adding all of the stagefright tests am: 9ca478dae2 am: 7f9fbb56a5 by Badash · 7 years ago
  12. 5cab05e DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also adding all of the stagefright tests am: 9ca478dae2 by Badash · 7 years ago
  13. 7f9fbb5 DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also adding all of the stagefright tests by Badash · 7 years ago
  14. 69c7001 CTS/STS test for Android Security b/36604779 by Andres Celis · 7 years ago
  15. 22179f4 Merge "properly setup/teardown the test" into oc-dev am: c18bfa2dce by Todd Kennedy · 7 years ago
  16. c18bfa2 Merge "properly setup/teardown the test" into oc-dev by TreeHugger Robot · 7 years ago
  17. 9ca478d DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also by Badash · 7 years ago
  18. 427e436 Merge "Protect autofill UI against redressing - CTS" into oc-dev am: 42bc75bd71 by Svetoslav Ganov · 7 years ago
  19. d7b8a38 Merge "Batterystats logs smeared power model values" into oc-dev am: 513fba2925 by Lei Yu · 7 years ago
  20. 0620502 Patch error in which --retry filters parameterized tests by Aaron Holden · 7 years ago
  21. fca6cd0 Merge "Mark EdgeEffectTests#testOnAbsorb() as @LargeTest" into oc-dev by Aurimas Liutikas · 7 years ago
  22. e200b2c Merge "New Autofill tests:" into oc-dev am: 9cba9f12e2 by Felipe Leme · 7 years ago
  23. 42bc75b Merge "Protect autofill UI against redressing - CTS" into oc-dev by Svetoslav Ganov · 7 years ago
  24. 513fba2 Merge "Batterystats logs smeared power model values" into oc-dev by Lei Yu · 7 years ago
  25. fc29bbd Merge "Mark EdgeEffectTests#testOnAbsorb() as @LargeTest" into oc-dev by TreeHugger Robot · 7 years ago
  26. 9cba9f1 Merge "New Autofill tests:" into oc-dev by Felipe Leme · 7 years ago
  27. 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 · 7 years ago
  28. 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 · 7 years ago
  29. 1b62a46 Merge "Ignore requests not coming from the CtsAutoFillServiceTestCases" into oc-dev by Felipe Leme · 7 years ago
  30. 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 · 7 years ago
  31. 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 · 7 years ago
  32. 1db9bb9 StagefrightTest: add test for OOB write in sonivox. am: 0022ceef36 am: cabc120c5c am: 518a35be34 am: c19440f9fc am: eca22cb80b by Wei Jia · 7 years ago
  33. 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 · 7 years ago
  34. b7f9bad Merge "AudioSecurityTest: verify equalizer get parameter name" into nyc-dev am: bb4a78f661 am: b86930f533 -s ours am: e9c439f666 am: e89fdf77f9 by Andy Hung · 7 years ago
  35. 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 · 7 years ago
  36. 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 · 7 years ago
  37. 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) · 7 years ago
  38. 5be9bda3 Merge "Ignore requests not coming from the CtsAutoFillServiceTestCases" into oc-dev by TreeHugger Robot · 7 years ago
  39. 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 · 7 years ago
  40. 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 · 7 years ago
  41. 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 · 7 years ago
  42. 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 · 7 years ago
  43. 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 · 7 years ago
  44. 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 · 7 years ago
  45. eafcd9d StagefrightTest: add test for OOB write in sonivox. am: 0022ceef36 am: cabc120c5c am: 518a35be34 am: c19440f9fc by Wei Jia · 7 years ago
  46. 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 · 7 years ago
  47. 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 · 7 years ago
  48. eceb0b8 Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063 by Wei Jia · 7 years ago
  49. 388ed53 Merge "AudioSecurityTest: verify equalizer get parameter name" into nyc-dev am: bb4a78f661 am: b86930f533 -s ours am: e9c439f666 by Andy Hung · 7 years ago
  50. 9d4ae78 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 by Wei Jia · 7 years ago
  51. 851299d 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 by tinazh · 7 years ago
  52. 0f230de 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 by tinazh · 7 years ago
  53. 24d892f 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 by tinazh · 7 years ago
  54. 522a5c1 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 by Wei Jia · 7 years ago
  55. 0a40dad 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 by tinazh · 7 years ago
  56. ffe09c8 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 by Ricardo Garcia · 7 years ago
  57. 58563a0 Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours" into nougat-cts-dev am: d0f7bdcf22 -s ours" into nyc-dev am: 1332090a3e am: 0f5ce2ec80 am: b50ec0cca1 am: 635843d877 am: 2d84e3a925 -s ours by tinazh · 7 years ago
  58. 2d73345 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 by Andy Hung · 7 years ago
  59. 7b2cf1a 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 Android Build Merger (Role) · 7 years ago
  60. 1933bb1 Merge changes from topic 'am-6787bd5fc8ed41dab02342626b22c7a3' into nyc-dev am: 299a957c59 am: bae70ba566 am: 88b562a385 am: 97c7e371e0 am: d51046c293 by Marco Nelissen · 7 years ago
  61. 8bef5e6 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 by Marco Nelissen · 7 years ago
  62. 5aba424 Merge "Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063" into oc-dev by Android Build Merger (Role) · 7 years ago
  63. e89fdf7 Merge "AudioSecurityTest: verify equalizer get parameter name" into nyc-dev am: bb4a78f661 am: b86930f533 -s ours by Andy Hung · 7 years ago
  64. eca22cb StagefrightTest: add test for OOB write in sonivox. am: 0022ceef36 am: cabc120c5c am: 518a35be34 by Wei Jia · 7 years ago
  65. e464dbe Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee by Wei Jia · 7 years ago
  66. 1297bf4 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 by Wei Jia · 7 years ago
  67. 0f3811a 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 by Wei Jia · 7 years ago
  68. 9ee582f 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 by tinazh · 7 years ago
  69. e9c439f Merge "AudioSecurityTest: verify equalizer get parameter name" into nyc-dev am: bb4a78f661 by Andy Hung · 7 years ago
  70. 283ea8f Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee by Wei Jia · 7 years ago
  71. f6cb521 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 by tinazh · 7 years ago
  72. 7a46ed1 Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 am: e7ed7d8332 am: bbf2c8beb3 am: 0cff2a7f39 am: 3aac3fedcf am: 49cd49cdda am: 435299c0f9 am: 0a2096f0ef am: ee789b0387 am: 9d8876b7d0 by Jay Tu · 7 years ago
  73. aa4dff6 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 by tinazh · 7 years ago
  74. d44ae2a 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 by tinazh · 7 years ago
  75. f4f58eb resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 by Wei Jia · 7 years ago
  76. 38bb301 Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours" into nougat-cts-dev am: d0f7bdcf22 -s ours" into nyc-dev am: 1332090a3e am: 0f5ce2ec80 am: b50ec0cca1 am: 635843d877 by tinazh · 7 years ago
  77. 658597c Merge "Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 -s ours" into nougat-cts-dev am: 9fe7f1c1f8 am: 1a7bbf63f5 am: f925caccf8 am: d9bd286886 am: 444975136c am: 3bb9f11dbc by Jay Tu · 7 years ago
  78. af21963 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 by Ricardo Garcia · 7 years ago
  79. 10b0533 Merge changes from topic 'am-6787bd5fc8ed41dab02342626b22c7a3' into nyc-dev am: 299a957c59 am: bae70ba566 am: 88b562a385 am: 97c7e371e0 by Marco Nelissen · 7 years ago
  80. 8c59223 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 by Andy Hung · 7 years ago
  81. da52af7 Merge "DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also adding all of the stagefright tests" into nyc-dev am: 7567271c88 am: ad564d483c -s ours am: 2ddf1af593 am: 32db4da68e am: 3f3d0d1209 -s ours by Badash · 7 years ago
  82. c19440f StagefrightTest: add test for OOB write in sonivox. am: 0022ceef36 am: cabc120c5c by Wei Jia · 7 years ago
  83. 7bd593a 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 by Marco Nelissen · 7 years ago
  84. 534737d Merge changes from topic 'am-6d94399fe9a54e68bb328faaf8347068' into marshmallow-cts-dev am: 2ce803790f am: 5d739c197a am: f9a98c827c am: 526223e004 am: 64377a9338 am: 638cccd6c8 am: 8df755521a by Wei Jia · 7 years ago
  85. e25511c Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 by Wei Jia · 7 years ago
  86. be4f6fa 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 by Wei Jia · 7 years ago
  87. 1560933 Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 am: e7ed7d8332 am: bbf2c8beb3 am: 0cff2a7f39 am: 3aac3fedcf am: 49cd49cdda am: 435299c0f9 am: 0a2096f0ef am: ee789b0387 by Jay Tu · 7 years ago
  88. dc08cbf 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 by tinazh · 7 years ago
  89. c4a2d29 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 by tinazh · 7 years ago
  90. 12e45d5 Merge "Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 -s ours" into nougat-cts-dev am: 9fe7f1c1f8 am: 1a7bbf63f5 am: f925caccf8 am: d9bd286886 am: 444975136c by Jay Tu · 7 years ago
  91. 2d84e3a Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours" into nougat-cts-dev am: d0f7bdcf22 -s ours" into nyc-dev am: 1332090a3e am: 0f5ce2ec80 am: b50ec0cca1 by tinazh · 7 years ago
  92. c2e0b37 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 by tinazh · 7 years ago
  93. fcd443d Merge "DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also adding all of the stagefright tests" into nyc-dev am: 7567271c88 am: ad564d483c -s ours am: 2ddf1af593 am: 32db4da68e by Badash · 7 years ago
  94. df7705b resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 by Wei Jia · 7 years ago
  95. d51046c Merge changes from topic 'am-6787bd5fc8ed41dab02342626b22c7a3' into nyc-dev am: 299a957c59 am: bae70ba566 am: 88b562a385 by Marco Nelissen · 7 years ago
  96. a95f351 Merge "DO NOT MERGE ANYWHERE: bump cts for 201708 security public bulletin Bug:37328047 Change-Id: I488fb2e2f3cfcbe8f7645d10e8d532eb91fb519e" into nyc-dev am: ee89112359 -s ours by tinazh · 7 years ago
  97. b86930f Merge "AudioSecurityTest: verify equalizer get parameter name" into nyc-dev by Andy Hung · 7 years ago
  98. 2c0d58a 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 by Ricardo Garcia · 7 years ago
  99. c0439b2 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 by Marco Nelissen · 7 years ago
  100. a0492d9 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 by Andy Hung · 7 years ago