1. b9017be Merge commit 'b3ef447e82a42e7fe84e6ee81b7f44a07d9345d0' into HEAD by Wei Jia · 9 years ago
  2. cd475df am 594963dd: (-s ours) am d61c8d39: am 4f378d75: cts: get video size from CamcorderProfile -- DO NOT MERGE by Chong Zhang · 9 years ago
  3. b3ef447 am 00aaf0b1: am 9d70c799: Merge "rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into klp-dev by Wei Jia · 9 years ago
  4. 00aaf0b am 9d70c799: Merge "rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into klp-dev by Wei Jia · 9 years ago
  5. 9d70c79 Merge "rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into klp-dev by Wei Jia · 9 years ago
  6. 594963d am d61c8d39: am 4f378d75: cts: get video size from CamcorderProfile -- DO NOT MERGE by Chong Zhang · 9 years ago
  7. d61c8d3 am 4f378d75: cts: get video size from CamcorderProfile -- DO NOT MERGE by Chong Zhang · 9 years ago
  8. d21bfad Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into lmp-dev by Daniel Xie · 9 years ago
  9. ad20543 cts: get video size from CamcorderProfile -- DO NOT MERGE by Chong Zhang · 9 years ago
  10. 4f378d7 cts: get video size from CamcorderProfile -- DO NOT MERGE by Chong Zhang · 9 years ago
  11. dd42912 am 7378587e: (-s ours) am a6387714: am e039c05f: am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  12. 7378587 am a6387714: am e039c05f: am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  13. a638771 am e039c05f: am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  14. e039c05 am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  15. 885182d Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  16. eaba159 DO NOT MERGE ANYWHERE: fix breakage by Daniel Xie · 9 years ago
  17. 54c452f am 586fb41b: Merge "Should return true if the specified file doesn\'t exist" into lollipop-cts-dev by Daniel Xie · 9 years ago
  18. 586fb41 Merge "Should return true if the specified file doesn't exist" into lollipop-cts-dev by Daniel Xie · 9 years ago
  19. 91fe807 Merge "DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches" into lmp-dev by Robert Shih · 9 years ago
  20. 7c8b314 am e8ce7690: Merge "Fixed android.uirendering package in CTS-5.0_R3" into lollipop-cts-dev by Daniel Xie · 9 years ago
  21. 0544753 am 104f4316: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into lollipop-cts-dev by Daniel Xie · 9 years ago
  22. 4062964 am 9e7c72c0: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into jb-dev automerge: e85b1c6 -s ours automerge: af857be -s ours automerge: 350853a -s ours automerge: 5df7c06 -s ours by Nicholas Sauer · 9 years ago
  23. 3b88565 am 6307e355: Merge "Camera2: Fix waiting for surface size change" into lollipop-cts-dev by Chien-Yu Chen · 9 years ago
  24. 4f300dd am 307cd547: Merge "fixed mockview" into kitkat-cts-dev automerge: b7a630f -s ours by Daniel Xie · 9 years ago
  25. 9aa565e am db124f73: Merge "Collect smallestScreenWidthDp in CTS" into kitkat-cts-dev automerge: 0dfe152 by Nicholas Sauer · 9 years ago
  26. 6b7071f am d7b36097: (-s ours) Merge "DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop" into lollipop-cts-dev by Yin-Chia Yeh · 9 years ago
  27. 41f66ce am 43a17442: Merge "Make LauncherApps tests less flakey." into lollipop-cts-dev by Kenny Guy · 9 years ago
  28. 2a6218d am e7918277: Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev by Daniel Xie · 9 years ago
  29. b545ddf am 72dc4bc7: Merge "Send broadcasts to the CTS Robot even if it is stopped." into lollipop-cts-dev by Daniel Xie · 9 years ago
  30. 4c53fed am f24c7e3a: (-s ours) Merge "DO NOT MERGE: adding 1 more knownfailure" into kitkat-cts-dev automerge: aace927 -s ours by Daniel Xie · 9 years ago
  31. e328be2 am 3c3da0f0: (-s ours) Merge "DO NOT MERGE: Bumping CTS 4.4 R4" into kitkat-cts-dev automerge: cdcc28e -s ours by Daniel Xie · 9 years ago
  32. 62bf85d am 54286d2b: (-s ours) Merge "DO NOT MERGE: Adding known failures for CTS 4.4 R4" into kitkat-cts-dev automerge: 43602dd -s ours by Daniel Xie · 9 years ago
  33. 2f560e8 am 85cd818f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 5295dc6 by Daniel Xie · 9 years ago
  34. 8f997fb am 1712bffb: Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev automerge: 5e6120e by Daniel Xie · 9 years ago
  35. 236a3bb am 60a61108: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c by Daniel Xie · 9 years ago
  36. 1ce4e78 am f3dd5ae6: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: 61f6182 -s ours by Daniel Xie · 9 years ago
  37. 7a6b05b am 6ec683d9: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev automerge: f394d10 by Daniel Xie · 9 years ago
  38. 41ea656 am 47e02eb6: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev automerge: c59abe4 -s ours by Daniel Xie · 9 years ago
  39. 1044110 am f1fac19a: Merge "fix audio policy service binder security tests." into kitkat-cts-dev automerge: 6716898 by Daniel Xie · 9 years ago
  40. 8781d0d am a1eb3bfe: Merge "Changed the size of MockView according to resolution." into kitkat-cts-dev automerge: 4a53e93 -s ours by Daniel Xie · 9 years ago
  41. 99c8f77 am c9dd7108: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours by Daniel Xie · 9 years ago
  42. 02c406c am 8c948271: Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev automerge: dcf21f4 -s ours by Daniel Xie · 9 years ago
  43. 240c397 am e0e957af: Merge "Modify user agent CTS test to (optionally) match new webview user agent." into lollipop-cts-dev by Gustav Sennton · 9 years ago
  44. 39b3129 am fdfa9769: (-s ours) Merge "DO NOT MERGE: Camera: don\'t always require ZSL template" into lollipop-cts-dev by Daniel Xie · 9 years ago
  45. a79f552 am 3b0dc26b: Merge "Ensure JobScheduler Connectivity CTS reenables WiFI" into lollipop-cts-dev by Daniel Xie · 9 years ago
  46. 0ab8f2e am 950a8988: Merge "CTS test for PingPongRoot vulnerability" into lollipop-cts-dev by Daniel Xie · 9 years ago
  47. 4db526f am d4a695ab: Merge "Fix CTS_5.0_r3 720p_preview/1080p_recording failures b/22467525" into lollipop-cts-dev by Daniel Xie · 9 years ago
  48. b61b387 am 6ea7b782: Merge "TIF: use term \'3rd-party\' instead of \'third-party\'" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  49. 949baa5 am 0d8dcd5d: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev automerge: 52a2733 by Daniel Xie · 9 years ago
  50. 6d5089b am 7f2984fc: Merge "TIF: use \'TV app\' instead of \'Live Channels\'" into lollipop-cts-dev by Daniel Xie · 9 years ago
  51. e961b09 am 37581fa5: Merge "CtsVerifier: update mPreviewTex in case of mismatch with mFormatView" into jb-mr1.1-cts-dev automerge: db2f7f4 automerge: 8236bcd automerge: 675f1cc by Daniel Xie · 9 years ago
  52. 42c295f am d8302648: Merge "Handling NPE in case of AVC level under 2" into kitkat-cts-dev automerge: d84cacb -s ours by Daniel Xie · 9 years ago
  53. e954f69 am d6e0ed1c: Merge "Fix CTS verifier camera orientation test." into kitkat-cts-dev automerge: 674617f by Yin-Chia Yeh · 9 years ago
  54. 1922f13 am 424644fc: Merge "Revert "Check for microphone feature in video camera recording tests."" into kitkat-cts-dev automerge: 1f6e28c -s ours by Yin-Chia Yeh · 9 years ago
  55. 27e476b am ef8b550c: Merge "Revert "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests."" into kitkat-cts-dev automerge: 3323726 by Yin-Chia Yeh · 9 years ago
  56. d8aae7a am 43772d1c: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev automerge: beaa1c1 by Daniel Xie · 9 years ago
  57. 6f42f69 am 557dddb4: Merge "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests." into kitkat-cts-dev automerge: b5b05ae by Daniel Xie · 9 years ago
  58. b740dd1 am a9bb8ed5: Merge "Check for microphone feature in video camera recording tests." into kitkat-cts-dev automerge: 72893be -s ours by Daniel Xie · 9 years ago
  59. f813d99 am d2162c81: Merge "Change assertcode of checkSignalStrength in DumpsysHostTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  60. 1ae833f am fde9054e: Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev automerge: ca0d846 automerge: 30e83c0 automerge: 76c8e3d by Daniel Xie · 9 years ago
  61. 67a9816 am e866e410: Merge "Revert "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail"" into jb-mr1.1-cts-dev automerge: 7e9df5b automerge: e167a31 automerge: 1aa503c by Daniel Xie · 9 years ago
  62. 57d5624 am f6b2775e: Merge "Fix CTS build" into lollipop-cts-dev by JP Abgrall · 9 years ago
  63. 7cf4f71 am 74338c1e: Merge "Adding 53024, NZC as it does not support report delivery." into kitkat-cts-dev automerge: de56635 by Daniel Xie · 9 years ago
  64. 2e80d59 am 9948dea3: Merge "CtsUiAutomatorTest pinchin/pinout test case: add support for 480X320 pixel solution device. The pinchin/pinout test need the device solution bigger than ***X400. This is hardcode in the CtsUiAutomatorTest.java the source code is: withinMarginOfErro by Daniel Xie · 9 years ago
  65. 8a6889c am aac28857: Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue" into jb-mr2-cts-dev automerge: fcd7cb7 automerge: c73d810 by Daniel Xie · 9 years ago
  66. cfca25f am 906578cc: (-s ours) Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev automerge: 09c6bcf -s ours by Daniel Xie · 9 years ago
  67. 335d8fd am 0ff36b1a: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac by Daniel Xie · 9 years ago
  68. cbcf8b8 am dcdb68d6: Merge "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail" into jb-mr1.1-cts-dev automerge: b28682b automerge: 7032ac7 automerge: 3efc0e5 by Daniel Xie · 9 years ago
  69. 64d4c87 Merge commit '451b577ddfde5496c447f939051287e825d37c55' into m by Daniel Xie · 9 years ago
  70. eda5802 am 254071be: (-s ours) DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev by Daniel Xie · 9 years ago
  71. 254071b DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev by Daniel Xie · 9 years ago
  72. b97ebb8 resolved conflicts for 451b577d to lmp-dev by Daniel Xie · 9 years ago
  73. 471bb6b am c09bc3f7: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev automerge: 3aac281 by Daniel Xie · 9 years ago
  74. 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
  75. 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
  76. 3f7eeed am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours by Daniel Xie · 9 years ago
  77. c2f0e5e am 32d37080: am ec5c384f: Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev by Daniel Xie · 9 years ago
  78. 32d3708 am ec5c384f: Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev by Daniel Xie · 9 years ago
  79. ec5c384 Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev by Daniel Xie · 9 years ago
  80. e8ce769 Merge "Fixed android.uirendering package in CTS-5.0_R3" into lollipop-cts-dev by Daniel Xie · 9 years ago
  81. 7011146 am 6444b0f4: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev automerge: c282df3 by Daniel Xie · 9 years ago
  82. 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
  83. e1d462e am e17beccf: Merge "Remove bad test cases from MemoryFileTest." into kitkat-cts-dev automerge: 36db51e by Daniel Xie · 9 years ago
  84. 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
  85. b108e0d am d449dd5f: am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file by Robert Shih · 9 years ago
  86. d449dd5 am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file by Robert Shih · 9 years ago
  87. 6c21b90 rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp by Wei Jia · 9 years ago
  88. 435d256 am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file by Robert Shih · 9 years ago
  89. 62e162a Test if libstagefright dies in onInputBufferFilled on currupted file by Robert Shih · 9 years ago
  90. 5b20ed7 Should return true if the specified file doesn't exist by Masanori OGINO · 9 years ago
  91. dffe462 Merge "DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""" into lmp-dev by Andy Hung · 9 years ago
  92. 9baf829 DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp"" by Andy Hung · 9 years ago
  93. a99ccd9 DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches by Robert Shih · 9 years ago
  94. 0bad9e7 am d62c086b: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev automerge: 4d7e03f by Daniel Xie · 9 years ago
  95. bd766cf am 83ca91cd: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev automerge: ba39064 by Daniel Xie · 9 years ago
  96. baeb930 am 19b8f3b2: Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev automerge: 7951d40 by Daniel Xie · 9 years ago
  97. 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
  98. 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
  99. 5833052 am a6cc0a82: Merge "CTS: Add check for same sensor event timestamp" into lollipop-cts-dev by Aniroop Mathur · 9 years ago
  100. 1056d83 am 38c06998: Merge "Added 5.0 to expected VERSION_RELEASE." into lollipop-cts-dev by jungyee.yoo · 9 years ago