1. 64d4c87 Merge commit '451b577ddfde5496c447f939051287e825d37c55' into m by Daniel Xie · 9 years ago
  2. eda5802 am 254071be: (-s ours) DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev by Daniel Xie · 9 years ago
  3. 254071b DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev by Daniel Xie · 9 years ago
  4. b97ebb8 resolved conflicts for 451b577d to lmp-dev by Daniel Xie · 9 years ago
  5. 471bb6b am c09bc3f7: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev automerge: 3aac281 by Daniel Xie · 9 years ago
  6. 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
  7. 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
  8. 3f7eeed am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours by Daniel Xie · 9 years ago
  9. c2f0e5e am 32d37080: am ec5c384f: Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev by Daniel Xie · 9 years ago
  10. 32d3708 am ec5c384f: Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev by Daniel Xie · 9 years ago
  11. ec5c384 Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev by Daniel Xie · 9 years ago
  12. 7011146 am 6444b0f4: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev automerge: c282df3 by Daniel Xie · 9 years ago
  13. 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
  14. e1d462e am e17beccf: Merge "Remove bad test cases from MemoryFileTest." into kitkat-cts-dev automerge: 36db51e by Daniel Xie · 9 years ago
  15. 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
  16. b108e0d am d449dd5f: am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file by Robert Shih · 9 years ago
  17. d449dd5 am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file by Robert Shih · 9 years ago
  18. 435d256 am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file by Robert Shih · 9 years ago
  19. 62e162a Test if libstagefright dies in onInputBufferFilled on currupted file by Robert Shih · 9 years ago
  20. dffe462 Merge "DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""" into lmp-dev by Andy Hung · 9 years ago
  21. 9baf829 DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp"" by Andy Hung · 9 years ago
  22. 0bad9e7 am d62c086b: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev automerge: 4d7e03f by Daniel Xie · 9 years ago
  23. bd766cf am 83ca91cd: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev automerge: ba39064 by Daniel Xie · 9 years ago
  24. baeb930 am 19b8f3b2: Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev automerge: 7951d40 by Daniel Xie · 9 years ago
  25. 3a515cd am c8819400: Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 by Unsuk Jung · 9 years ago
  26. fbe287c 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
  27. 5833052 am a6cc0a82: Merge "CTS: Add check for same sensor event timestamp" into lollipop-cts-dev by Aniroop Mathur · 9 years ago
  28. 1056d83 am 38c06998: Merge "Added 5.0 to expected VERSION_RELEASE." into lollipop-cts-dev by jungyee.yoo · 9 years ago
  29. c17ae0d am 06d53ec1: Merge "Fix CTS android.app package testSetDismissMessage seldom fail issue" into kitkat-cts-dev automerge: 5f7e625 by Unsuk Jung · 9 years ago
  30. 52aeeb5 am e61db7d3: Merge "Fix android.hardware.camera2.cts.RobustnessTest#testMandatoryOutputCombinations failure." into lollipop-cts-dev by Daniel Xie · 9 years ago
  31. 9c6d8da am 653f0cd9: Merge "Remove duplicate CTS tests from libcore cts packages." into lollipop-cts-dev by Narayan Kamath · 9 years ago
  32. 8c79e6d am d3bfe6e9: Merge "Exception in TestAccessHistory tearDown" into lollipop-cts-dev by Daniel Xie · 9 years ago
  33. 9d4ae82 am 306cf947: Merge "Fix race condition in testSendOrderedBroadcast1" into lollipop-cts-dev by Daniel Xie · 9 years ago
  34. 54ddcfb am 1fa98e8a: Merge "Changed the value TEST_TIME_OUT from 5000 to 10000." into lollipop-cts-dev by Daniel Xie · 9 years ago
  35. 3e35405 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
  36. 185dc03 am d5716c83: Merge "CTS: Add test for JNI class-loading" into lollipop-cts-dev by Daniel Xie · 9 years ago
  37. dd9c993 am 633928fc: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e by Daniel Xie · 9 years ago
  38. 13b5095 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
  39. 9585f9c am c507bc6e: Merge "Sleep between write and read in EventLogTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  40. e6af3f8 am 809b7f9b: Merge "set delay during testPerformFiltering" into kitkat-cts-dev automerge: 73965a8 by Lance Jin-woong Chang · 9 years ago
  41. f2f3234 am a6a52864: Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev automerge: 16763e6 by Daniel Xie · 9 years ago
  42. 3cabb80 resolved conflicts for 242a72ea to lmp-dev by Nicholas Sauer · 9 years ago
  43. a8dbf0d am a55bf067: Merge "Make non-clickable item not focusable" into lollipop-cts-dev by Chulwoo Lee · 9 years ago
  44. 2de9b9d am ea2805de: Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev by Daniel Xie · 9 years ago
  45. 6d54ada am f9ffa901: Merge "Removing launcher tests from knownfailures" into lollipop-cts-dev by Esteban Talavera · 9 years ago
  46. d5225f3 am de95b4ba: (-s ours) Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lollipop-cts-dev by Daniel Xie · 9 years ago
  47. 343a7f0 am 25afa649: Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  48. fa48792 am df8cb6d1: Merge "Camera: fix time measuring logic" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  49. ff0c4ab am 3b077c29: Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  50. c8328a8 am 3b15b5ee: (-s ours) Merge "DO NOT MERGE: missing comma" into lollipop-cts-dev by Daniel Xie · 9 years ago
  51. 22ea583 am 55a3493e: (-s ours) Merge "DO NOT MERGE: Disabling testConnectViaHttpProxyToHttpsUsingBadProxyAndHttpResponseCache test" into lollipop-cts-dev by Daniel Xie · 9 years ago
  52. d95836a am 79d97606: Merge "CtsDeviceVideoPerf: limit bitrate to main or baseline profiles" into lollipop-cts-dev by Daniel Xie · 9 years ago
  53. 82cd5e5 am 81e14f4e: Merge "CTS: Fix memory leak in RSBlendTest loop." into kitkat-cts-dev automerge: e062486 -s ours by Daniel Xie · 9 years ago
  54. 86cc814 am 23c49fbf: Merge "AppSecurityTests: Do not delete in WhiteLists." into kitkat-cts-dev automerge: ac79e25 by Daniel Xie · 9 years ago
  55. cdad057 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
  56. e7b7f41 am c304eedd: Merge "Revert "Cts test fix for shortcode 48000"" into lollipop-cts-dev by Daniel Xie · 9 years ago
  57. 025bd02 am 87a13283: Merge "fix incorrection assumption due to DST" into lollipop-cts-dev by Daniel Xie · 9 years ago
  58. 0e753a8 am df91c971: Merge "Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into lollipop-cts-dev by Daniel Xie · 9 years ago
  59. 274054f am 6c43c15a: (-s ours) Merge "DO NOT MERGE - bump CTS version to CTS 5.0_r3" into lollipop-cts-dev by Daniel Xie · 9 years ago
  60. 9b5b9f4 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
  61. 099280e 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
  62. fe7fbbb am 076e7ea4: Merge "Fix for com.android.cts.verifier.camera.video.CameraVideoActivity" into kitkat-cts-dev automerge: 9d5a03f by Daniel Xie · 9 years ago
  63. 9b3abc6 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
  64. 7e0fc27 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
  65. c50d284 am ccde590a: Merge "Add more CTS for MediaController" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  66. 5adf372 am 4aeb538d: Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  67. f99cc4b am b7703ecb: Merge "Add CTS for MediaBrowserService" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  68. 26c7d92 am 4c8ddbd9: Merge "TIF: Ensure the global search can query EPG data" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  69. 5a179fa am a5945eea: Merge "fix UiAutomationTest.testWindowContentFrameStatsNoAnimation FAIL" into lollipop-cts-dev by Daniel Xie · 9 years ago
  70. 1f31404 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
  71. 1564a12 am 715fe887: Merge "Fix for testListen" into lollipop-cts-dev by Daniel Xie · 9 years ago
  72. 45d23b2 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
  73. bf2a69d am 76b1710a: Merge "Cts test fix for shortcode 48000" into lollipop-cts-dev by Daniel Xie · 9 years ago
  74. 53d4592 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
  75. 9030efd am c18e0e89: Merge "Use video without B frames for early EOS test" into lollipop-cts-dev by Marco Nelissen · 9 years ago
  76. e60989b am fe6938e0: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev by Amith Dsouza · 9 years ago
  77. b01b816 am 6c78c8e8: Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev by Daniel Xie · 9 years ago
  78. 95d7fb5 am 97fa3a23: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  79. 8d782e4 am 62f111d0: Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  80. 7dae8e2 am 6a44e145: Merge "Camera: change supported preview/video size logic" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  81. d8a0fb4 am 5c9059dc: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: cbbfd90 automerge: 2f901ce automerge: 75fb000 by Nicholas Sauer · 9 years ago
  82. 12e9a5f am 9ee3edef: am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev automerge: a029dcc automerge: f569614 automerge: 64b4f92 by Nicholas Sauer · 9 years ago
  83. d318b7f am f4009752: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: a15ba0e automerge: 6c4b47f automerge: 2614df0 by Nicholas Sauer · 9 years ago
  84. 734def6 am 4c725a38: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev automerge: 430eeb7 automerge: 9f02f1a automerge: 358d417 by Marco Nelissen · 9 years ago
  85. d334f5c am 7831295a: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev automerge: 869d252 automerge: 1a174fc automerge: 877f741 by Marco Nelissen · 9 years ago
  86. f1dd55c am 6f1b9e2a: am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. automerge: 1245cdc automerge: 3a415ff automerge: b4aa5b3 by Eric Laurent · 9 years ago
  87. 2895678 am 8d6ba405: am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case testQueryExternalMiniThumbnails failure" into jb-dev automerge: b812960 automerge: 8013ee6 automerge: 4659b16 by Unsuk Jung · 9 years ago
  88. 8a91dd9 am 07a0d2cb: Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01 automerge: 739f204 by Nick Kralevich · 9 years ago
  89. ad388cb am 6d4a6d3e: Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  90. 9540df0 am 32e17d40: Merge "Add CTS for MediaSession.Token" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  91. b5166b1 am 71a8a6d7: Merge "Add CTS for MediaBrowser" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  92. dbc90b9 am 6585d2a7: Merge "Add CTS for MediaBrowser.MediaItem" into lollipop-cts-dev by Sungsoo Lim · 9 years ago
  93. 764f323 am f460e3e3: Merge "TIF: Add test case for TvView.TvInputCallback.onConnectionFailed()" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  94. 741da47 am 98641202: Merge "Disable WebGL tests from CTS" into lollipop-cts-dev by Bo Liu · 9 years ago
  95. 4d55d0c am a2fe7980: Merge "Modify user agent CTS test to match new webview user agent string." into lollipop-cts-dev by Richard Coles · 9 years ago
  96. be695cf am 77c931d2: Merge "TIF: Add missing test cases for TvInputService" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  97. 8265b25 am ebc0ba05: Merge "TIF: Add missing test cases for TvInputManager" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  98. 1941c84 am 448d1e11: Merge "TIF: Add test cases for TvContract.Channels and TvContact.Programs.Genres" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  99. 4e263ec am d8f754a0: Merge "TIF: Add missing tests for android.media.tv.TvInputInfo" into lollipop-cts-dev by Jae Seo · 9 years ago
  100. b25ca64 am 3682098c: Merge "Update cts to not require multi-user when managed_users are declared" into lollipop-cts-dev by Fyodor Kupolov · 9 years ago