1. 64b4550 DO NOT MERGE ANYWHERE: Merge commit '7679e48230a3b2ddb530c6626825fd7bd854bd24' into manual_merge_7679e482 by Daniel Xie · 9 years ago
  2. 7679e48 am 64d4c87a: Merge commit \'451b577ddfde5496c447f939051287e825d37c55\' into m by Daniel Xie · 9 years ago
  3. 5f6ed7e am 476f1d7e: am eda58024: am 254071be: (-s ours) DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev by Daniel Xie · 9 years ago
  4. 476f1d7 am eda58024: am 254071be: (-s ours) DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev by Daniel Xie · 9 years ago
  5. 64d4c87 Merge commit '451b577ddfde5496c447f939051287e825d37c55' into m by Daniel Xie · 9 years ago
  6. eda5802 am 254071be: (-s ours) DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev by Daniel Xie · 9 years ago
  7. f94cafa am 015cad1f: am b97ebb80: resolved conflicts for 451b577d to lmp-dev by Daniel Xie · 9 years ago
  8. 015cad1 am b97ebb80: resolved conflicts for 451b577d to lmp-dev by Daniel Xie · 9 years ago
  9. 254071b DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev by Daniel Xie · 9 years ago
  10. b97ebb8 resolved conflicts for 451b577d to lmp-dev by Daniel Xie · 9 years ago
  11. 57fd059 am c26d5738: am 471bb6bc: am c09bc3f7: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev automerge: 3aac281 by Daniel Xie · 9 years ago
  12. 94de36b am 3989d10d: am bc49b46d: am 39e0e012: Merge "Verify the failed test case of CTS for WebView" into kitkat-cts-dev automerge: 7228fac -s ours by Daniel Xie · 9 years ago
  13. 9f94d81 am 172fd5ee: am 8ab546e3: am e2a23438: Merge "Improve the usability of CTS Verifier "Camera Formats"" into kitkat-cts-dev automerge: f54af35 -s ours by Daniel Xie · 9 years ago
  14. 3ef7718 am 2ad28109: am 3f7eeed2: am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours by Daniel Xie · 9 years ago
  15. c26d573 am 471bb6bc: am c09bc3f7: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev automerge: 3aac281 by Daniel Xie · 9 years ago
  16. 3989d10 am bc49b46d: am 39e0e012: Merge "Verify the failed test case of CTS for WebView" into kitkat-cts-dev automerge: 7228fac -s ours by Daniel Xie · 9 years ago
  17. 172fd5e am 8ab546e3: am e2a23438: Merge "Improve the usability of CTS Verifier "Camera Formats"" into kitkat-cts-dev automerge: f54af35 -s ours by Daniel Xie · 9 years ago
  18. 2ad2810 am 3f7eeed2: am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours by Daniel Xie · 9 years ago
  19. 471bb6b am c09bc3f7: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev automerge: 3aac281 by Daniel Xie · 9 years ago
  20. bc49b46 am 39e0e012: Merge "Verify the failed test case of CTS for WebView" into kitkat-cts-dev automerge: 7228fac -s ours by Daniel Xie · 9 years ago
  21. 8ab546e am e2a23438: Merge "Improve the usability of CTS Verifier "Camera Formats"" into kitkat-cts-dev automerge: f54af35 -s ours by Daniel Xie · 9 years ago
  22. 3f7eeed am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours by Daniel Xie · 9 years ago
  23. c2f0e5e am 32d37080: am ec5c384f: Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev by Daniel Xie · 9 years ago
  24. 32d3708 am ec5c384f: Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev by Daniel Xie · 9 years ago
  25. ec5c384 Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev by Daniel Xie · 9 years ago
  26. e9589df am ce43fc90: am 70111464: am 6444b0f4: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev automerge: c282df3 by Daniel Xie · 9 years ago
  27. fcbbb20 am b414e3bd: am 38c555e6: am 44fed250: Merge "AbiTest: Include QDSP6 ELF binaries in validity check" into kitkat-cts-dev automerge: 639522d -s ours by Daniel Xie · 9 years ago
  28. a09dbb8 am 3493b1c2: am e1d462e3: am e17beccf: Merge "Remove bad test cases from MemoryFileTest." into kitkat-cts-dev automerge: 36db51e by Daniel Xie · 9 years ago
  29. daed62a Merge commit 'ef33f002' into mm-ef33f002 by Unsuk Jung · 9 years ago
  30. b25f5ba am ab5f43b7: am b108e0d9: am d449dd5f: am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file by Robert Shih · 9 years ago
  31. 67a9edd am d5833ca8: am dffe4621: Merge "DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""" into lmp-dev by Andy Hung · 9 years ago
  32. 801f518 am 12c53ddb: am 0bad9e7c: am d62c086b: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev automerge: 4d7e03f by Daniel Xie · 9 years ago
  33. 65dd857 am 78f6e9ce: am bd766cf1: am 83ca91cd: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev automerge: ba39064 by Daniel Xie · 9 years ago
  34. f3ea35b am c9ef435f: am baeb930f: am 19b8f3b2: Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev automerge: 7951d40 by Daniel Xie · 9 years ago
  35. 7e279f7 am f9e1c1ca: am 3a515cd3: am c8819400: Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 by Unsuk Jung · 9 years ago
  36. 2c9296a am 5ed1f31d: am fbe287ca: am 65fbe1fc: Merge "Chage the timeout while rendering to overcome the low performance device." into kitkat-cts-dev automerge: a6b1e10 -s ours by Jungyee Yoo · 9 years ago
  37. 1d9dcfd am 834b1299: am 58330528: am a6cc0a82: Merge "CTS: Add check for same sensor event timestamp" into lollipop-cts-dev by Aniroop Mathur · 9 years ago
  38. 343f367 resolved conflicts for 6b782819 to lmp-mr1-dev by Unsuk Jung · 9 years ago
  39. 5ea363f am 51c4d118: am c17ae0d7: am 06d53ec1: Merge "Fix CTS android.app package testSetDismissMessage seldom fail issue" into kitkat-cts-dev automerge: 5f7e625 by Unsuk Jung · 9 years ago
  40. 20675fb am 5fe0eaee: am 52aeeb52: am e61db7d3: Merge "Fix android.hardware.camera2.cts.RobustnessTest#testMandatoryOutputCombinations failure." into lollipop-cts-dev by Daniel Xie · 9 years ago
  41. 2ac7a45 am 9fb26ba7: am 9c6d8dab: am 653f0cd9: Merge "Remove duplicate CTS tests from libcore cts packages." into lollipop-cts-dev by Narayan Kamath · 9 years ago
  42. 1cde67e am fc868f0c: am 8c79e6d2: am d3bfe6e9: Merge "Exception in TestAccessHistory tearDown" into lollipop-cts-dev by Daniel Xie · 9 years ago
  43. c81feb8 am f5e4c96d: am 9d4ae826: am 306cf947: Merge "Fix race condition in testSendOrderedBroadcast1" into lollipop-cts-dev by Daniel Xie · 9 years ago
  44. e9acb08 am 45778c1d: am 54ddcfb2: am 1fa98e8a: Merge "Changed the value TEST_TIME_OUT from 5000 to 10000." into lollipop-cts-dev by Daniel Xie · 9 years ago
  45. 9e2a007 am 62e59219: am 3e354050: am 9576ae86: Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev automerge: a00f78c automerge: 37f4b54 -s ours by Daniel Xie · 9 years ago
  46. 8850bf3 am 4fab34db: am 185dc031: am d5716c83: Merge "CTS: Add test for JNI class-loading" into lollipop-cts-dev by Daniel Xie · 9 years ago
  47. 2cbc624 am abe4571b: am dd9c9939: am 633928fc: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e by Daniel Xie · 9 years ago
  48. 4c9a67c am be979228: am 13b5095a: am 6e8f6a77: Merge "Fix bugs regarding ShortCodeTest that fails without "112" in ECC List." into kitkat-cts-dev automerge: 8fcd728 -s ours by Daniel Xie · 9 years ago
  49. 6738c33 am 21abb843: am 9585f9ca: am c507bc6e: Merge "Sleep between write and read in EventLogTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  50. 4e16751 am 985ab652: am e6af3f8e: am 809b7f9b: Merge "set delay during testPerformFiltering" into kitkat-cts-dev automerge: 73965a8 by Lance Jin-woong Chang · 9 years ago
  51. c76e0e7 am 1428fbba: am f2f32342: am a6a52864: Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev automerge: 16763e6 by Daniel Xie · 9 years ago
  52. bb75771 resolved conflicts for 50d071ae to lmp-mr1-dev by Unsuk Jung · 9 years ago
  53. ce43fc9 am 70111464: am 6444b0f4: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev automerge: c282df3 by Daniel Xie · 9 years ago
  54. b414e3b am 38c555e6: am 44fed250: Merge "AbiTest: Include QDSP6 ELF binaries in validity check" into kitkat-cts-dev automerge: 639522d -s ours by Daniel Xie · 9 years ago
  55. 3493b1c am e1d462e3: am e17beccf: Merge "Remove bad test cases from MemoryFileTest." into kitkat-cts-dev automerge: 36db51e by Daniel Xie · 9 years ago
  56. ef33f00 am e63a1f2a: am c0cc7ed8: (-s ours) Merge "Skip encoding tests for unsupported resolutions." into kitkat-cts-dev automerge: f34f376 -s ours by Daniel Xie · 9 years ago
  57. ab5f43b am b108e0d9: am d449dd5f: am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file by Robert Shih · 9 years ago
  58. 7011146 am 6444b0f4: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev automerge: c282df3 by Daniel Xie · 9 years ago
  59. 38c555e am 44fed250: Merge "AbiTest: Include QDSP6 ELF binaries in validity check" into kitkat-cts-dev automerge: 639522d -s ours by Daniel Xie · 9 years ago
  60. e1d462e am e17beccf: Merge "Remove bad test cases from MemoryFileTest." into kitkat-cts-dev automerge: 36db51e by Daniel Xie · 9 years ago
  61. e63a1f2 am c0cc7ed8: (-s ours) Merge "Skip encoding tests for unsupported resolutions." into kitkat-cts-dev automerge: f34f376 -s ours by Daniel Xie · 9 years ago
  62. b108e0d am d449dd5f: am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file by Robert Shih · 9 years ago
  63. 9351dc4 am 1c886754: am a8dbf0d0: am a55bf067: Merge "Make non-clickable item not focusable" into lollipop-cts-dev by Chulwoo Lee · 9 years ago
  64. e3fcbef am 182bb54f: am 2de9b9d2: am ea2805de: Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev by Daniel Xie · 9 years ago
  65. 98149a1 am b8cde03b: am 6d54adae: am f9ffa901: Merge "Removing launcher tests from knownfailures" into lollipop-cts-dev by Esteban Talavera · 9 years ago
  66. 7b94b84 am 146de78c: am d5225f3f: am de95b4ba: (-s ours) Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lollipop-cts-dev by Daniel Xie · 9 years ago
  67. df6399e am 1fc2d9bb: am 343a7f01: am 25afa649: Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  68. d449dd5 am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file by Robert Shih · 9 years ago
  69. ef10acc am 0e353da8: am fa487921: am df8cb6d1: Merge "Camera: fix time measuring logic" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  70. d1e5663 am c2aaa543: am ff0c4ab6: am 3b077c29: Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  71. c24e020 resolved conflicts for 03f41fc7 to lmp-mr1-dev by Unsuk Jung · 9 years ago
  72. 435d256 am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file by Robert Shih · 9 years ago
  73. 62e162a Test if libstagefright dies in onInputBufferFilled on currupted file by Robert Shih · 9 years ago
  74. 502b837 resolved conflicts for b5499ef5 to lmp-mr1-dev by Unsuk Jung · 9 years ago
  75. 5a6823b am d47f0c37: am d95836ae: am 79d97606: Merge "CtsDeviceVideoPerf: limit bitrate to main or baseline profiles" into lollipop-cts-dev by Daniel Xie · 9 years ago
  76. ed1b9b1 am 20503b03: am 82cd5e5c: am 81e14f4e: Merge "CTS: Fix memory leak in RSBlendTest loop." into kitkat-cts-dev automerge: e062486 -s ours by Daniel Xie · 9 years ago
  77. db88ffb am 52f65bd8: am 86cc8140: am 23c49fbf: Merge "AppSecurityTests: Do not delete in WhiteLists." into kitkat-cts-dev automerge: ac79e25 by Daniel Xie · 9 years ago
  78. 9797f39 am 2cdc65f5: am cdad0572: am eb4eb9e9: Merge "Revert "Modify user agent CTS test to match new webview user agent string."" into lollipop-cts-dev by Daniel Xie · 9 years ago
  79. 76ddde6 am c80863be: am e7b7f417: am c304eedd: Merge "Revert "Cts test fix for shortcode 48000"" into lollipop-cts-dev by Daniel Xie · 9 years ago
  80. 07eaa81 am 752a6964: am 025bd02c: am 87a13283: Merge "fix incorrection assumption due to DST" into lollipop-cts-dev by Daniel Xie · 9 years ago
  81. 7f75869 am 4d32e370: am 0e753a86: am df91c971: Merge "Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into lollipop-cts-dev by Daniel Xie · 9 years ago
  82. e16977e resolved conflicts for 2dbf3b3a to lmp-mr1-dev by Unsuk Jung · 9 years ago
  83. 0072076 am 3e3e71b9: am 9b5b9f41: am bfabed1f: 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 by Daniel Xie · 9 years ago
  84. b249166 am 2cab845b: am 099280e9: am 4e80dc17: (-s ours) Merge "DO NOT MERGE: Cts test fix for shortcode 48000" into kitkat-cts-dev automerge: ffd250a -s ours by Daniel Xie · 9 years ago
  85. 7766fe4 am 2eabe31f: am fe7fbbb1: am 076e7ea4: Merge "Fix for com.android.cts.verifier.camera.video.CameraVideoActivity" into kitkat-cts-dev automerge: 9d5a03f by Daniel Xie · 9 years ago
  86. 5811239 am c22598cd: am 9b3abc67: am 880e4ac7: Merge "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: 457f95e by Daniel Xie · 9 years ago
  87. 3f77164 am a5d2ab68: am 7e0fc271: am e711a36e: (-s ours) Merge "DO NOT MERGE: Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into kitkat-cts-dev automerge: b3405de -s ours by Daniel Xie · 9 years ago
  88. 8933b44 am 3c8e9b98: am c50d2847: am ccde590a: Merge "Add more CTS for MediaController" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  89. fba6cc5 am a562ddcf: am 5adf372c: am 4aeb538d: Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  90. 964f1c3 am bff9958d: am f99cc4ba: am b7703ecb: Merge "Add CTS for MediaBrowserService" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  91. cb7d956 am 65cb7f94: am 26c7d928: am 4c8ddbd9: Merge "TIF: Ensure the global search can query EPG data" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  92. e1357cd am 7dcb52fa: am 5a179fac: am a5945eea: Merge "fix UiAutomationTest.testWindowContentFrameStatsNoAnimation FAIL" into lollipop-cts-dev by Daniel Xie · 9 years ago
  93. dd40995 am 5d3becd8: am 1f314046: am c0edc3c6: (-s ours) Merge "[DO NOT MERGE]Fix ION memory leak for camera2 testStillPreviewCombination" into lollipop-cts-dev by Daniel Xie · 9 years ago
  94. a0238f2 am b556e58b: am 1564a126: am 715fe887: Merge "Fix for testListen" into lollipop-cts-dev by Daniel Xie · 9 years ago
  95. 5884926 am 92151993: am 45d23b25: am 34ece2dd: Merge "5.0_r1 Verifier:Fix no-connectivity constraint job missing running issue" into lollipop-cts-dev by Daniel Xie · 9 years ago
  96. 3ab9365 am 9cce00c4: am bf2a69dd: am 76b1710a: Merge "Cts test fix for shortcode 48000" into lollipop-cts-dev by Daniel Xie · 9 years ago
  97. 37bda1b am f1e31663: am 53d45920: am 5ac9f6cd: Merge "Add 44051 to NO_DELIVERY_REPORTS, DATA_SMS, MULTIPART_SMS" into kitkat-cts-dev automerge: 10212a1 by Daniel Xie · 9 years ago
  98. 0a4f62b am 4c5153cc: am 9030efde: am c18e0e89: Merge "Use video without B frames for early EOS test" into lollipop-cts-dev by Marco Nelissen · 9 years ago
  99. 3dd2989 am 9845d105: am e60989be: am fe6938e0: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev by Amith Dsouza · 9 years ago
  100. 401ba74 am 3f797832: am b01b8167: am 6c78c8e8: Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev by Daniel Xie · 9 years ago