1. 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
  2. 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
  3. 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
  4. 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
  5. 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
  6. 076a77b am 247fa4ba: am a79f552d: am 3b0dc26b: Merge "Ensure JobScheduler Connectivity CTS reenables WiFI" into lollipop-cts-dev by Daniel Xie · 9 years ago
  7. 8937f19 am 955f4d4e: am 0ab8f2e3: am 950a8988: Merge "CTS test for PingPongRoot vulnerability" into lollipop-cts-dev by Daniel Xie · 9 years ago
  8. 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
  9. 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
  10. 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
  11. 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
  12. 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
  13. 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
  14. 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
  15. 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
  16. 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
  17. 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
  18. 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
  19. 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
  20. 107f06f am e730759f: am f813d99e: am d2162c81: Merge "Change assertcode of checkSignalStrength in DumpsysHostTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  21. fba233b am 33ad8700: am 1ae833fb: 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
  22. 740d1a4 am 40a4bbea: am 67a98163: 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
  23. 0fce02e am a0b6ce93: am 57d56240: am f6b2775e: Merge "Fix CTS build" into lollipop-cts-dev by JP Abgrall · 9 years ago
  24. c1cc157 am 5e28d329: am 7cf4f71f: 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
  25. 160699b am c393d23e: am 2e80d597: 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 c by Daniel Xie · 9 years ago
  26. 2679e70 am 320ffd89: am 8a6889c5: 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
  27. 8d5253e am 2c0a5ca5: am cfca25f4: 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
  28. d81ee05 am 242e7188: am 335d8fd9: am 0ff36b1a: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac by Daniel Xie · 9 years ago
  29. 91e9627 am 824283d1: am cbcf8b89: 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
  30. 64b4550 DO NOT MERGE ANYWHERE: Merge commit '7679e48230a3b2ddb530c6626825fd7bd854bd24' into manual_merge_7679e482 by Daniel Xie · 9 years ago
  31. b1b162a 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
  32. 13ccb59 am 99c8f777: am c9dd7108: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours by Daniel Xie · 9 years ago
  33. 56d5cd9 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
  34. 477644b 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
  35. db4c4b4 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
  36. 247fa4b am a79f552d: am 3b0dc26b: Merge "Ensure JobScheduler Connectivity CTS reenables WiFI" into lollipop-cts-dev by Daniel Xie · 9 years ago
  37. 955f4d4 am 0ab8f2e3: am 950a8988: Merge "CTS test for PingPongRoot vulnerability" into lollipop-cts-dev by Daniel Xie · 9 years ago
  38. 55f3df1 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
  39. fe025c6 am b61b387c: am 6ea7b782: Merge "TIF: use term \'3rd-party\' instead of \'third-party\'" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  40. 6fa1ea7 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
  41. 46b2a3f am 6d5089b2: am 7f2984fc: Merge "TIF: use \'TV app\' instead of \'Live Channels\'" into lollipop-cts-dev by Daniel Xie · 9 years ago
  42. 98cefc3 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
  43. 669cd99 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
  44. 79de318 am e954f691: am d6e0ed1c: Merge "Fix CTS verifier camera orientation test." into kitkat-cts-dev automerge: 674617f by Yin-Chia Yeh · 9 years ago
  45. 18ff08f 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
  46. 40d0ac2 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
  47. 079c124 am d8aae7a8: am 43772d1c: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev automerge: beaa1c1 by Daniel Xie · 9 years ago
  48. 2844f09 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
  49. 8ff9c63 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
  50. e730759 am f813d99e: am d2162c81: Merge "Change assertcode of checkSignalStrength in DumpsysHostTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  51. 33ad870 am 1ae833fb: 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
  52. 40a4bbe am 67a98163: 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
  53. a0b6ce9 am 57d56240: am f6b2775e: Merge "Fix CTS build" into lollipop-cts-dev by JP Abgrall · 9 years ago
  54. 5e28d32 am 7cf4f71f: 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
  55. c393d23 am 2e80d597: 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: withi by Daniel Xie · 9 years ago
  56. 320ffd8 am 8a6889c5: 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
  57. 2c0a5ca am cfca25f4: 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
  58. 242e718 am 335d8fd9: am 0ff36b1a: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac by Daniel Xie · 9 years ago
  59. 824283d am cbcf8b89: 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
  60. 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
  61. 99c8f77 am c9dd7108: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours by Daniel Xie · 9 years ago
  62. 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
  63. 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
  64. 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
  65. a79f552 am 3b0dc26b: Merge "Ensure JobScheduler Connectivity CTS reenables WiFI" into lollipop-cts-dev by Daniel Xie · 9 years ago
  66. 0ab8f2e am 950a8988: Merge "CTS test for PingPongRoot vulnerability" into lollipop-cts-dev by Daniel Xie · 9 years ago
  67. 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
  68. b61b387 am 6ea7b782: Merge "TIF: use term \'3rd-party\' instead of \'third-party\'" into lollipop-cts-dev by Dongwon Kang · 9 years ago
  69. 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
  70. 6d5089b am 7f2984fc: Merge "TIF: use \'TV app\' instead of \'Live Channels\'" into lollipop-cts-dev by Daniel Xie · 9 years ago
  71. 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
  72. 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
  73. e954f69 am d6e0ed1c: Merge "Fix CTS verifier camera orientation test." into kitkat-cts-dev automerge: 674617f by Yin-Chia Yeh · 9 years ago
  74. 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
  75. 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
  76. d8aae7a am 43772d1c: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev automerge: beaa1c1 by Daniel Xie · 9 years ago
  77. 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
  78. 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
  79. f813d99 am d2162c81: Merge "Change assertcode of checkSignalStrength in DumpsysHostTest" into lollipop-cts-dev by Daniel Xie · 9 years ago
  80. 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
  81. 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
  82. 57d5624 am f6b2775e: Merge "Fix CTS build" into lollipop-cts-dev by JP Abgrall · 9 years ago
  83. 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
  84. 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
  85. 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
  86. 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
  87. 335d8fd am 0ff36b1a: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac by Daniel Xie · 9 years ago
  88. 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
  89. 7679e48 am 64d4c87a: Merge commit \'451b577ddfde5496c447f939051287e825d37c55\' into m by Daniel Xie · 9 years ago
  90. 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
  91. 476f1d7 am eda58024: am 254071be: (-s ours) DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev by Daniel Xie · 9 years ago
  92. 64d4c87 Merge commit '451b577ddfde5496c447f939051287e825d37c55' into m by Daniel Xie · 9 years ago
  93. eda5802 am 254071be: (-s ours) DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev by Daniel Xie · 9 years ago
  94. f94cafa am 015cad1f: am b97ebb80: resolved conflicts for 451b577d to lmp-dev by Daniel Xie · 9 years ago
  95. 015cad1 am b97ebb80: resolved conflicts for 451b577d to lmp-dev by Daniel Xie · 9 years ago
  96. 254071b DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev by Daniel Xie · 9 years ago
  97. b97ebb8 resolved conflicts for 451b577d to lmp-dev by Daniel Xie · 9 years ago
  98. 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
  99. 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
  100. 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