1. fe0c8f2 Merge "DO NOT MERGE: Disable two multi user tests for TV devices" into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  2. dcd796b Merge "DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase" into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  3. 49175b0 DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase by Junjie Hu · 9 years ago
  4. 6752d39 Merge "DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure" into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  5. 60e3381 DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure by Yin-Chia Yeh · 9 years ago
  6. f143e2c Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  7. 37ece1e Merge "CameraITS: use linear tonemap in test_exposure" into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  8. 6dcff9f CameraITS: use linear tonemap in test_exposure by Gaurav Batra · 9 years ago
  9. c004f8f TIF: Make sure that Cursor.moveToNext() is called before using Cursor by Dongwon Kang · 9 years ago
  10. 35addd3 DO NOT MERGE: Disable two multi user tests for TV devices by Dongwon Kang · 9 years ago
  11. e771efe Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  12. 7fe1f92 DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam by Alex Chau · 9 years ago
  13. 9b8e668 Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  14. 5e689a8 Allow number of supported Bitmap to be greater than 4. by Wally Yau · 9 years ago
  15. 5614190 fixed breakage by Daniel Xie · 9 years ago
  16. 203f699 cts: get video size from CamcorderProfile -- DO NOT MERGE by Chong Zhang · 9 years ago
  17. 71fa8dd BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure by Daniel Xie · 9 years ago
  18. 25360f8 BUG: 23954202 fixed minimum memory to be 1099 by Daniel Xie · 9 years ago
  19. f6483e8 Add 5-second timeout to testFlacHeapOverflow by Robert Shih · 9 years ago
  20. 45eca1e Remove corrupt test file by Marco Nelissen · 9 years ago
  21. a0351d4 merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev by The Android Automerger · 9 years ago
  22. 05b588a am 0975c166: am b9017be7: Merge commit \'b3ef447e82a42e7fe84e6ee81b7f44a07d9345d0\' into HEAD by Wei Jia · 9 years ago
  23. 0975c16 am b9017be7: Merge commit \'b3ef447e82a42e7fe84e6ee81b7f44a07d9345d0\' into HEAD by Wei Jia · 9 years ago
  24. b9017be Merge commit 'b3ef447e82a42e7fe84e6ee81b7f44a07d9345d0' into HEAD by Wei Jia · 9 years ago
  25. b34cb0d am 1b7f247c: am cd475df9: am 594963dd: (-s ours) am d61c8d39: am 4f378d75: cts: get video size from CamcorderProfile -- DO NOT MERGE by Chong Zhang · 9 years ago
  26. 08c8092 am e38dfdc1: am d21bfade: Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into lmp-dev by Daniel Xie · 9 years ago
  27. 1b7f247 am cd475df9: am 594963dd: (-s ours) am d61c8d39: am 4f378d75: cts: get video size from CamcorderProfile -- DO NOT MERGE by Chong Zhang · 9 years ago
  28. cd475df am 594963dd: (-s ours) am d61c8d39: am 4f378d75: cts: get video size from CamcorderProfile -- DO NOT MERGE by Chong Zhang · 9 years ago
  29. 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
  30. 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
  31. 9d70c79 Merge "rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into klp-dev by Wei Jia · 9 years ago
  32. 329d2bb cts: get video size from CamcorderProfile -- DO NOT MERGE by Chong Zhang · 9 years ago
  33. 594963d am d61c8d39: am 4f378d75: cts: get video size from CamcorderProfile -- DO NOT MERGE by Chong Zhang · 9 years ago
  34. fc5b06e Merge "BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure" into lmp-mr1-dev by Daniel Xie · 9 years ago
  35. dd1977c BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure by Daniel Xie · 9 years ago
  36. e38dfdc am d21bfade: Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into lmp-dev by Daniel Xie · 9 years ago
  37. d61c8d3 am 4f378d75: cts: get video size from CamcorderProfile -- DO NOT MERGE by Chong Zhang · 9 years ago
  38. d21bfad Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into lmp-dev by Daniel Xie · 9 years ago
  39. ad20543 cts: get video size from CamcorderProfile -- DO NOT MERGE by Chong Zhang · 9 years ago
  40. 4f378d7 cts: get video size from CamcorderProfile -- DO NOT MERGE by Chong Zhang · 9 years ago
  41. 6f9b657 am 3b59ea03: am dd429123: 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
  42. 3b59ea0 am dd429123: 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
  43. 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
  44. 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
  45. 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
  46. 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
  47. 885182d Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev by Daniel Xie · 9 years ago
  48. 9a99de6 Merge "BUG: 23954202 fixed minimum memory to be 1099" into lmp-mr1-dev by Daniel Xie · 9 years ago
  49. b0a3558 BUG: 23954202 fixed minimum memory to be 1099 by Daniel Xie · 9 years ago
  50. 3f84453 am fc19d135: (-s ours) am eaba159b: (-s ours) DO NOT MERGE ANYWHERE: fix breakage by Daniel Xie · 9 years ago
  51. fc19d13 am eaba159b: (-s ours) DO NOT MERGE ANYWHERE: fix breakage by Daniel Xie · 9 years ago
  52. eaba159 DO NOT MERGE ANYWHERE: fix breakage by Daniel Xie · 9 years ago
  53. 12aba5f DO NOT MERGE: fix breakage by Daniel Xie · 9 years ago
  54. 15c7623 am 6a8db850: am 54c452f2: am 586fb41b: Merge "Should return true if the specified file doesn\'t exist" into lollipop-cts-dev by Daniel Xie · 9 years ago
  55. 6a8db85 am 54c452f2: am 586fb41b: Merge "Should return true if the specified file doesn\'t exist" into lollipop-cts-dev by Daniel Xie · 9 years ago
  56. 54c452f am 586fb41b: Merge "Should return true if the specified file doesn\'t exist" into lollipop-cts-dev by Daniel Xie · 9 years ago
  57. 586fb41 Merge "Should return true if the specified file doesn't exist" into lollipop-cts-dev by Daniel Xie · 9 years ago
  58. ff397e6 am cc40c023: (-s ours) am 91fe8072: (-s ours) Merge "DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches" into lmp-dev by Robert Shih · 9 years ago
  59. cc40c02 am 91fe8072: (-s ours) Merge "DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches" into lmp-dev by Robert Shih · 9 years ago
  60. 379468d resolved conflicts for 07831126 to lmp-mr1-dev by Daniel Xie · 9 years ago
  61. 8229b21 am b7da0b8c: am 05447533: 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
  62. d73116b am a9f632ee: am 40629641: 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 by Nicholas Sauer · 9 years ago
  63. 880d1d1 am 18ea82b0: am 3b885659: am 6307e355: Merge "Camera2: Fix waiting for surface size change" into lollipop-cts-dev by Chien-Yu Chen · 9 years ago
  64. c369e54 am 66a3c178: am 4f300dd8: am 307cd547: Merge "fixed mockview" into kitkat-cts-dev automerge: b7a630f -s ours by Daniel Xie · 9 years ago
  65. aca0540 am b63011af: am 9aa565e2: am db124f73: Merge "Collect smallestScreenWidthDp in CTS" into kitkat-cts-dev automerge: 0dfe152 by Nicholas Sauer · 9 years ago
  66. eb0d793 am 703266a4: (-s ours) am 6b7071ff: (-s ours) 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
  67. 19a4146 am 6cfe86ad: am 41f66cec: am 43a17442: Merge "Make LauncherApps tests less flakey." into lollipop-cts-dev by Kenny Guy · 9 years ago
  68. 91fe807 Merge "DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches" into lmp-dev by Robert Shih · 9 years ago
  69. 735a5d4 am 89b888b6: am 2a6218d2: am e7918277: Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev by Daniel Xie · 9 years ago
  70. b990a22 am c5372027: am b545ddfd: am 72dc4bc7: Merge "Send broadcasts to the CTS Robot even if it is stopped." into lollipop-cts-dev by Daniel Xie · 9 years ago
  71. 8644b3d am 550ba396: am 4c53fed0: 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
  72. 8d5bd4c resolved conflicts for 15c7e068 to lmp-mr1-dev by Daniel Xie · 9 years ago
  73. eff5baa DO NOT MERGE: resolved conflicts for 85a6998e to lmp-mr1-dev by Daniel Xie · 9 years ago
  74. d7e29d7 am c9c6452f: am 2f560e8b: am 85cd818f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 5295dc6 by Daniel Xie · 9 years ago
  75. 2769a77 am f88b62bc: am 8f997fb6: am 1712bffb: Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev automerge: 5e6120e by Daniel Xie · 9 years ago
  76. afb0b2f am 8c40edcd: am 236a3bb7: am 60a61108: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c by Daniel Xie · 9 years ago
  77. 4c4c235 am af323b36: am 1ce4e788: am f3dd5ae6: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: 61f6182 -s ours by Daniel Xie · 9 years ago
  78. 73f22c6 am 0e91df78: am 7a6b05b0: am 6ec683d9: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev automerge: f394d10 by Daniel Xie · 9 years ago
  79. f3f1e77 am 79d96602: am 41ea656e: am 47e02eb6: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev automerge: c59abe4 -s ours by Daniel Xie · 9 years ago
  80. a403e7b am e72c11ad: am 1044110e: am f1fac19a: Merge "fix audio policy service binder security tests." into kitkat-cts-dev automerge: 6716898 by Daniel Xie · 9 years ago
  81. 88a4461 am b1b162a8: am 8781d0d9: 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
  82. c0c712f am 13ccb595: am 99c8f777: am c9dd7108: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours by Daniel Xie · 9 years ago
  83. 201ba87 am 56d5cd90: am 02c406cf: 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
  84. 9eb6f34 am 477644b8: am 240c397b: 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
  85. f8bae55 am db4c4b40: am 39b31294: 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
  86. 076a77b am 247fa4ba: am a79f552d: am 3b0dc26b: Merge "Ensure JobScheduler Connectivity CTS reenables WiFI" into lollipop-cts-dev by Daniel Xie · 9 years ago
  87. 8937f19 am 955f4d4e: am 0ab8f2e3: am 950a8988: Merge "CTS test for PingPongRoot vulnerability" into lollipop-cts-dev by Daniel Xie · 9 years ago
  88. a18febd am 55f3df10: am 4db526ff: 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
  89. 4396661 am fe025c64: am b61b387c: am 6ea7b782: Merge "TIF: use term \'3rd-party\' instead of \'third-party\'" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  90. addebe6 am 6fa1ea7d: am 949baa53: am 0d8dcd5d: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev automerge: 52a2733 by Daniel Xie · 9 years ago
  91. 2ccd3e0 am 46b2a3f2: am 6d5089b2: am 7f2984fc: Merge "TIF: use \'TV app\' instead of \'Live Channels\'" into lollipop-cts-dev by Daniel Xie · 9 years ago
  92. 0931d0a am 98cefc3d: am e961b09b: 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
  93. a39fb36 am 669cd99b: am 42c295fb: 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
  94. 1cf2f83 am 79de3186: am e954f691: am d6e0ed1c: Merge "Fix CTS verifier camera orientation test." into kitkat-cts-dev automerge: 674617f by Yin-Chia Yeh · 9 years ago
  95. c750ae1 am 18ff08ff: am 1922f133: 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
  96. 5bd8971 am 40d0ac25: am 27e476b3: 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
  97. d944510 am 079c1249: am d8aae7a8: am 43772d1c: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev automerge: beaa1c1 by Daniel Xie · 9 years ago
  98. aee0d93 am 2844f093: am 6f42f69a: 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
  99. f8a816b am 8ff9c63e: am b740dd12: 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
  100. 107f06f am e730759f: am f813d99e: am d2162c81: Merge "Change assertcode of checkSignalStrength in DumpsysHostTest" into lollipop-cts-dev by Daniel Xie · 9 years ago