1. d5a7149 Fix bogus merge conflict resolution. by Narayan Kamath · 10 years ago
  2. af7a6eb am 1c7c613a: Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev automerge: 16763e6 automerge: a6a5286 by Daniel Xie · 10 years ago
  3. 1c7c613 Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev automerge: 16763e6 by Daniel Xie · 10 years ago
  4. a6a5286 Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev by Daniel Xie · 10 years ago
  5. 16763e6 Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev by Daniel Xie · 10 years ago
  6. fc21160 am 7dac1d13: Merge "Fix TelephonyManagerTest#testGetDeviceId CTS fail for android cts 4.4" into kitkat-cts-dev automerge: 6731f85 -s ours automerge: 242a72e by Daniel Xie · 10 years ago
  7. 7dac1d1 Merge "Fix TelephonyManagerTest#testGetDeviceId CTS fail for android cts 4.4" into kitkat-cts-dev automerge: 6731f85 -s ours by Daniel Xie · 10 years ago
  8. 242a72e Merge "Fix TelephonyManagerTest#testGetDeviceId CTS fail for android cts 4.4" into kitkat-cts-dev by Daniel Xie · 10 years ago
  9. 6731f85 Merge "Fix TelephonyManagerTest#testGetDeviceId CTS fail for android cts 4.4" into kitkat-cts-dev by Daniel Xie · 10 years ago
  10. 2819f47 am 3e265823: Merge "Make non-clickable item not focusable" into lollipop-cts-dev automerge: a55bf06 by Chulwoo Lee · 10 years ago
  11. 3e26582 Merge "Make non-clickable item not focusable" into lollipop-cts-dev by Chulwoo Lee · 10 years ago
  12. a55bf06 Merge "Make non-clickable item not focusable" into lollipop-cts-dev by Chulwoo Lee · 10 years ago
  13. c53bf77 am 40bc3681: Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev automerge: ea2805d by Daniel Xie · 10 years ago
  14. 2adbbab am 9c3d03e6: Merge "resolve merge conflicts of f9ffa90 to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev by Daniel Xie · 10 years ago
  15. 40bc368 Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev by Daniel Xie · 10 years ago
  16. 9c3d03e Merge "resolve merge conflicts of f9ffa90 to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev by Daniel Xie · 10 years ago
  17. d703f54 am 53791798: Merge "Add a CtsVerifier test to ensure the CAR_DOCK activity starts in car mode." into lollipop-mr1-cts-dev by Harsh Modi · 10 years ago
  18. 5379179 Merge "Add a CtsVerifier test to ensure the CAR_DOCK activity starts in car mode." into lollipop-mr1-cts-dev by Harsh Modi · 10 years ago
  19. ea2805d Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev by Daniel Xie · 10 years ago
  20. 7017003 resolve merge conflicts of f9ffa90 to lollipop-mr1-cts-dev. by Esteban Talavera · 10 years ago
  21. f9ffa90 Merge "Removing launcher tests from knownfailures" into lollipop-cts-dev by Esteban Talavera · 10 years ago
  22. 87d7f9d Change FRAMEDROP_TOLERANCE value when upper 15MP camera size. by hyeonsoo.jeon · 10 years ago
  23. da9d150 Make non-clickable item not focusable by Chulwoo Lee · 10 years ago
  24. 55bc213 am cb3ed032: Merge "Fix a bug regarding layout-unable to tap Button in ScreenPinningTestActivity" into lollipop-mr1-cts-dev by Daniel Xie · 10 years ago
  25. 2937d9a am a5ef3505: Merge "CTS verifier crashes while executing the "Notification Attention Management" test" into lollipop-mr1-cts-dev by Daniel Xie · 10 years ago
  26. fdd4d9a am de3337f6: (-s ours) Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lollipop-cts-dev automerge: de95b4b by Daniel Xie · 10 years ago
  27. cb3ed03 Merge "Fix a bug regarding layout-unable to tap Button in ScreenPinningTestActivity" into lollipop-mr1-cts-dev by Daniel Xie · 10 years ago
  28. a5ef350 Merge "CTS verifier crashes while executing the "Notification Attention Management" test" into lollipop-mr1-cts-dev by Daniel Xie · 10 years ago
  29. 2664062 CTS verifier crashes while executing the "Notification Attention Management" test by sindhuja · 10 years ago
  30. de3337f Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lollipop-cts-dev by Daniel Xie · 10 years ago
  31. de95b4b Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lollipop-cts-dev by Daniel Xie · 10 years ago
  32. 32ee085 am 76b26b0f: Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev automerge: 25afa64 by Sungsoo Lim · 10 years ago
  33. 76b26b0 Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev by Sungsoo Lim · 10 years ago
  34. 25afa64 Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev by Sungsoo Lim · 10 years ago
  35. ee871fb am c10dfe8a: (-s ours) Merge "DO NOT MERGE ANYWHERE fixed all merge issue" into lollipop-mr1-cts-dev by Daniel Xie · 10 years ago
  36. c10dfe8 Merge "DO NOT MERGE ANYWHERE fixed all merge issue" into lollipop-mr1-cts-dev by Daniel Xie · 10 years ago
  37. 3e642a2 DO NOT MERGE ANYWHERE fixed all merge issue by Daniel Xie · 10 years ago
  38. 19854d6 am 9e219614: Merge "Camera: fix time measuring logic" into lollipop-cts-dev automerge: df8cb6d by Yin-Chia Yeh · 10 years ago
  39. 6a82c32 am ac0d8f3a: Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev automerge: 3b077c2 by Yin-Chia Yeh · 10 years ago
  40. 9e21961 Merge "Camera: fix time measuring logic" into lollipop-cts-dev by Yin-Chia Yeh · 10 years ago
  41. ac0d8f3 Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev by Yin-Chia Yeh · 10 years ago
  42. df8cb6d Merge "Camera: fix time measuring logic" into lollipop-cts-dev by Yin-Chia Yeh · 10 years ago
  43. 3b077c2 Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev by Yin-Chia Yeh · 10 years ago
  44. f6e59e1 am c5854556: Merge "resolve merge conflicts of 3b15b5e to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev by Daniel Xie · 10 years ago
  45. c585455 Merge "resolve merge conflicts of 3b15b5e to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev by Daniel Xie · 10 years ago
  46. 1a0209c resolve merge conflicts of 3b15b5e to lollipop-mr1-cts-dev. by Daniel Xie · 10 years ago
  47. 3b15b5e Merge "DO NOT MERGE: missing comma" into lollipop-cts-dev by Daniel Xie · 10 years ago
  48. 81f81e4 DO NOT MERGE: missing comma by Daniel Xie · 10 years ago
  49. 5a5a8df am a2c2dab0: (-s ours) Merge "DO NOT MERGE: Disabling testConnectViaHttpProxyToHttpsUsingBadProxyAndHttpResponseCache test" into lollipop-cts-dev automerge: 55a3493 by Daniel Xie · 10 years ago
  50. a2c2dab Merge "DO NOT MERGE: Disabling testConnectViaHttpProxyToHttpsUsingBadProxyAndHttpResponseCache test" into lollipop-cts-dev by Daniel Xie · 10 years ago
  51. 55a3493 Merge "DO NOT MERGE: Disabling testConnectViaHttpProxyToHttpsUsingBadProxyAndHttpResponseCache test" into lollipop-cts-dev by Daniel Xie · 10 years ago
  52. e16d2c4 DO NOT MERGE: Disabling testConnectViaHttpProxyToHttpsUsingBadProxyAndHttpResponseCache test by Daniel Xie · 10 years ago
  53. 0264b23 Camera: fix time measuring logic by Yin-Chia Yeh · 10 years ago
  54. 4da5b45 am 0e64deba: Merge "CtsDeviceVideoPerf: limit bitrate to main or baseline profiles" into lollipop-cts-dev automerge: 79d9760 by Daniel Xie · 10 years ago
  55. 0e64deb Merge "CtsDeviceVideoPerf: limit bitrate to main or baseline profiles" into lollipop-cts-dev by Daniel Xie · 10 years ago
  56. 79d9760 Merge "CtsDeviceVideoPerf: limit bitrate to main or baseline profiles" into lollipop-cts-dev by Daniel Xie · 10 years ago
  57. fba26e4 CtsDeviceVideoPerf: limit bitrate to main or baseline profiles by Lajos Molnar · 10 years ago
  58. 09fd16c am af737698: Merge "CTS test SELinuxDomainTest should be updated." into lollipop-mr1-cts-dev by Anna Kaminskaya · 10 years ago
  59. af73769 Merge "CTS test SELinuxDomainTest should be updated." into lollipop-mr1-cts-dev by Anna Kaminskaya · 10 years ago
  60. 209eff2 am abd0f1de: Merge "Increase polling timeout" into lollipop-mr1-cts-dev by Daniel Xie · 10 years ago
  61. abd0f1d Merge "Increase polling timeout" into lollipop-mr1-cts-dev by Daniel Xie · 10 years ago
  62. dddec3a am 9e3aa781: Merge "CTS: Fix memory leak in RSBlendTest loop." into kitkat-cts-dev automerge: e062486 -s ours automerge: 81e14f4 by Daniel Xie · 10 years ago
  63. 9e3aa78 Merge "CTS: Fix memory leak in RSBlendTest loop." into kitkat-cts-dev automerge: e062486 -s ours by Daniel Xie · 10 years ago
  64. 81e14f4 Merge "CTS: Fix memory leak in RSBlendTest loop." into kitkat-cts-dev by Daniel Xie · 10 years ago
  65. e062486 Merge "CTS: Fix memory leak in RSBlendTest loop." into kitkat-cts-dev by Daniel Xie · 10 years ago
  66. 897902d CTS: Fix memory leak in RSBlendTest loop. by Kedar Patil · 11 years ago
  67. b629358 resolved conflicts for merge of 54f21847 to lmp-mr1-dev by Daniel Xie · 10 years ago
  68. 54f2184 Merge "Revert "DO NOT MERGE: media: CTS workarounds for framework bugs"" into lmp-sprout-dev by Daniel Xie · 10 years ago
  69. 3f36e2b Revert "DO NOT MERGE: media: CTS workarounds for framework bugs" by Daniel Xie · 10 years ago
  70. c5fb159 am 6ba0e96b: Merge "AppSecurityTests: Do not delete in WhiteLists." into kitkat-cts-dev automerge: ac79e25 automerge: 23c49fb by Daniel Xie · 10 years ago
  71. 6ba0e96 Merge "AppSecurityTests: Do not delete in WhiteLists." into kitkat-cts-dev automerge: ac79e25 by Daniel Xie · 10 years ago
  72. 23c49fb Merge "AppSecurityTests: Do not delete in WhiteLists." into kitkat-cts-dev by Daniel Xie · 10 years ago
  73. ac79e25 Merge "AppSecurityTests: Do not delete in WhiteLists." into kitkat-cts-dev by Daniel Xie · 10 years ago
  74. ad94a47 am ffb39e26: Merge "Camera: fix video snapshot test" into lollipop-mr1-cts-dev by Yin-Chia Yeh · 10 years ago
  75. ffb39e2 Merge "Camera: fix video snapshot test" into lollipop-mr1-cts-dev by Yin-Chia Yeh · 10 years ago
  76. f9428c4 CtsVerifier: Camera FOV: cap FOV test to 120 degree by Yin-Chia Yeh · 10 years ago
  77. 2c6015d am 675d2683: Merge "Revert "Modify user agent CTS test to match new webview user agent string."" into lollipop-cts-dev automerge: eb4eb9e9 by Daniel Xie · 10 years ago
  78. 8dc7961 am 9830c42c: Merge "Revert "Cts test fix for shortcode 48000"" into lollipop-cts-dev automerge: c304eed by Daniel Xie · 10 years ago
  79. 675d268 Merge "Revert "Modify user agent CTS test to match new webview user agent string."" into lollipop-cts-dev by Daniel Xie · 10 years ago
  80. eb4eb9e9 Merge "Revert "Modify user agent CTS test to match new webview user agent string."" into lollipop-cts-dev by Daniel Xie · 10 years ago
  81. 39eabb9 Revert "Modify user agent CTS test to match new webview user agent string." by Daniel Xie · 10 years ago
  82. 9830c42 Merge "Revert "Cts test fix for shortcode 48000"" into lollipop-cts-dev by Daniel Xie · 10 years ago
  83. c304eed Merge "Revert "Cts test fix for shortcode 48000"" into lollipop-cts-dev by Daniel Xie · 10 years ago
  84. 947956c Revert "Cts test fix for shortcode 48000" by Daniel Xie · 10 years ago
  85. 9150fd8 [DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses by Stefan Kuhne · 10 years ago
  86. 6a744d2 am 2636644b: Merge "fix incorrection assumption due to DST" into lollipop-cts-dev automerge: 87a1328 by Daniel Xie · 10 years ago
  87. 2636644 Merge "fix incorrection assumption due to DST" into lollipop-cts-dev by Daniel Xie · 10 years ago
  88. 87a1328 Merge "fix incorrection assumption due to DST" into lollipop-cts-dev by Daniel Xie · 10 years ago
  89. 6005e10 fix incorrection assumption due to DST by Guang Zhu · 10 years ago
  90. 92b8d6e Camera: fix video snapshot test by Yin-Chia Yeh · 10 years ago
  91. 69e0b45 am f48839c1: Merge "Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into lollipop-cts-dev automerge: df91c97 by Daniel Xie · 10 years ago
  92. f48839c Merge "Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into lollipop-cts-dev by Daniel Xie · 10 years ago
  93. df91c97 Merge "Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into lollipop-cts-dev by Daniel Xie · 10 years ago
  94. 8d2ad05 Add CTS for MediaController.Callback by Sungsoo Lim · 10 years ago
  95. 1c88862 am 3770cadb: (-s ours) Merge "DO NOT MERGE - bump CTS version to CTS 5.0_r3" into lollipop-cts-dev automerge: 6c43c15 -s ours by Daniel Xie · 10 years ago
  96. 3770cad Merge "DO NOT MERGE - bump CTS version to CTS 5.0_r3" into lollipop-cts-dev by Daniel Xie · 10 years ago
  97. 6c43c15 Merge "DO NOT MERGE - bump CTS version to CTS 5.0_r3" into lollipop-cts-dev by Daniel Xie · 10 years ago
  98. e109e0a DO NOT MERGE - bump CTS version to CTS 5.0_r3 by Daniel Xie · 10 years ago
  99. cf05966 am a45836d3: Merge "Revert "As per the android documention 480p is defined as 720x480, 704x480 or 640x480. The test is hardcoding 480p to 720x480 and hence the test is failing other combinations."" into kitkat-cts-dev automerge: d1a5a58 automerge: bfabed1 by Daniel Xie · 10 years ago
  100. 96557b5 am ea59f60b: (-s ours) Merge "DO NOT MERGE: Cts test fix for shortcode 48000" into kitkat-cts-dev automerge: ffd250a -s ours automerge: 4e80dc1 by Daniel Xie · 10 years ago