1. b36d21c DO NOT MERGE ANYWHERE:revert and resubmit on lmp-dev by Robert Shih · 9 years ago
  2. f9777e9 resolved conflicts for d8f34e98 to lmp-mr1-dev by Unsuk Jung · 9 years ago
  3. 0b65959 Fix build error in ExtractDecodeEditEncodeMuxTest. by Tatsuhisa Yamaguchi · 9 years ago
  4. 455b60e resolved conflicts for 1a571197 to lmp-mr1-dev by Nicholas Sauer · 9 years ago
  5. 9afd5ac resolved conflicts for d3063af9 to lmp-mr1-dev by Nicholas Sauer · 9 years ago
  6. 2e627f0 am f67731b0: am b541ff7f: am 670baeca: (-s ours) DO NOT MERGE - Fix JobScheduler CTS tests by Christopher Tate · 9 years ago
  7. b58c8f5 am 112ceb89: am 27228e75: am aa059250: (-s ours) DO NOT MERGE: Fix AudioManagerTest#testVolume. by Takayuki Hoshi · 9 years ago
  8. b2a902f am 347aaca8: am 90d356d9: am 731c791e: (-s ours) Merge "DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs" into lmp-sprout-dev by Unsuk Jung · 9 years ago
  9. 9342368 resolved conflicts for a5b3514f to lmp-mr1-dev by Unsuk Jung · 9 years ago
  10. de6e523 am fedff466: am 21cc5c21: Merge "Remove corrupt test file" into lmp-dev by Marco Nelissen · 9 years ago
  11. ff9926e Revert "resolved conflicts for 5365cd9e to lmp-mr1-dev" by Unsuk Jung · 9 years ago
  12. 0d95d4a resolved conflicts for 5365cd9e to lmp-mr1-dev by Unsuk Jung · 9 years ago
  13. 2b7a3a4 am 4057a3f6: am 72ffb41f: am 3297b259: am e4ff0843: am f394d10b: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev by Daniel Xie · 9 years ago
  14. 1bf19cd am b57d1324: resolved conflicts for 5d2795d5 to lmp-dev by Unsuk Jung · 9 years ago
  15. ddaf581 am 58a9b148: am 061f7ae8: am 3eaefd66: am c501a856: am 67168984: Merge "fix audio policy service binder security tests." into kitkat-cts-dev by Daniel Xie · 9 years ago
  16. f35d33d am a3aca4a3: am 358d45e3: am c2ad0fb7: am 6903fb53: am 52a2733a: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev by Daniel Xie · 9 years ago
  17. 4f9eaee am 86f8b07b: am fbd2753f: resolved conflicts for a8ab57fe to klp-modular-dev by Yin-Chia Yeh · 9 years ago
  18. c22934e am 06a310d4: am 344a8b06: am 329be38a: am 334be519: am beaa1c12: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev by Daniel Xie · 9 years ago
  19. f2ec628 am 2f505efc: am 0a0bec55: resolved conflicts for 1168206d to klp-modular-dev by Unsuk Jung · 9 years ago
  20. 95dcb6e am 7beb0878: am a9853b0a: am 34f2fab8: am 9b5c55e2: am 76c8e3d5: Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev automerge: ca0d846 automerge: 30e83c0 by Daniel Xie · 9 years ago
  21. 4e457b0 am 57a93280: am 66c72bb4: am babbb90e: am 897fe389: am 1aa503cc: Merge "Revert "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail"" into jb-mr1.1-cts-dev automerge: 7e9df5b automerge: e167a31 by Daniel Xie · 9 years ago
  22. 063d987 am d9312d1c: am 71ef9586: am 72172502: am 12ac02b6: am de566354: Merge "Adding 53024, NZC as it does not support report delivery." into kitkat-cts-dev by Daniel Xie · 9 years ago
  23. 294980e am 0f694d41: am 57dd0679: am c1798a5a: am fbfa5f93: am 53fbbd05: 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 CtsUiAutom by Daniel Xie · 9 years ago
  24. 2a1d1a9 am 79b8a7a5: am 42a968d3: am 0e3b22b3: am d460a355: am 52948ac4: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev by Daniel Xie · 9 years ago
  25. 1d7a325 am 1e8b2747: am cc077750: am 71c5c3cc: am 8984ed1c: am 3aac281f: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev by Daniel Xie · 9 years ago
  26. 1a57119 am 25a380e3: resolved conflicts for 5bc69858 to lmp-dev by Unsuk Jung · 9 years ago
  27. d3063af am fd868af7: Merge "resolved conflicts for 90647f20 to lmp-dev" into lmp-dev by Unsuk Jung · 9 years ago
  28. f67731b am b541ff7f: am 670baeca: (-s ours) DO NOT MERGE - Fix JobScheduler CTS tests by Christopher Tate · 9 years ago
  29. 112ceb8 am 27228e75: am aa059250: (-s ours) DO NOT MERGE: Fix AudioManagerTest#testVolume. by Takayuki Hoshi · 9 years ago
  30. 347aaca am 90d356d9: am 731c791e: (-s ours) Merge "DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs" into lmp-sprout-dev by Unsuk Jung · 9 years ago
  31. 894683c am f4d8853c: am f45a7cc6: am 45004cb7: am 9ce0873c: am 4d7e03fc: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev by Daniel Xie · 9 years ago
  32. 4f17c9e am a66f06e2: am fa71ec25: am f1ba62b4: am ef1481dc: am ba39064d: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev by Daniel Xie · 9 years ago
  33. 2ad00f0 am 44cfb34a: am fe88ec43: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev by Unsuk Jung · 9 years ago
  34. fcf45f3 am c9d1fffc: am 3856616b: am 391ac7d4: am ef902753: am 73965a87: Merge "set delay during testPerformFiltering" into kitkat-cts-dev by Lance Jin-woong Chang · 9 years ago
  35. 49e2445 am bd5746cb: am 5e86f0bf: am 5a6f4f38: am 74a3ed18: am 16763e64: Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev by Daniel Xie · 9 years ago
  36. a5b3514 am 58041e06: resolved conflicts for 7a31d618 to lmp-dev by Unsuk Jung · 9 years ago
  37. 50bae44 am ff0b75d7: am cbbb3aed: am 375419cb: am 0f7b9b61: am 10212a15: Merge "Add 44051 to NO_DELIVERY_REPORTS, DATA_SMS, MULTIPART_SMS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  38. 5f847b4 am 2278f872: resolved conflicts for merge of 72173a02 to lmp-dev by Unsuk Jung · 9 years ago
  39. fedff46 am 21cc5c21: Merge "Remove corrupt test file" into lmp-dev by Marco Nelissen · 9 years ago
  40. 5365cd9 resolved conflicts for 2ad37646 to lmp-sprout-dev by Yin-Chia Yeh · 9 years ago
  41. 4057a3f am 72ffb41f: am 3297b259: am e4ff0843: am f394d10b: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev by Daniel Xie · 9 years ago
  42. b57d132 resolved conflicts for 5d2795d5 to lmp-dev by Unsuk Jung · 9 years ago
  43. 58a9b14 am 061f7ae8: am 3eaefd66: am c501a856: am 67168984: Merge "fix audio policy service binder security tests." into kitkat-cts-dev by Daniel Xie · 9 years ago
  44. ca74751 Merge "Add 5-second timeout to testFlacHeapOverflow" into lmp-mr1-dev by Robert Shih · 9 years ago
  45. a96d6ff am b5f8c3ba: am 0f92e27b: am b732a7a8: (-s ours) Merge "DO NOT MERGE: media: fix 4k hevc test stream" into lmp-sprout-dev by Ronghua Wu · 9 years ago
  46. b5f8c3b am 0f92e27b: am b732a7a8: (-s ours) Merge "DO NOT MERGE: media: fix 4k hevc test stream" into lmp-sprout-dev by Ronghua Wu · 9 years ago
  47. 9141ba5 Add 5-second timeout to testFlacHeapOverflow by Robert Shih · 9 years ago
  48. a3aca4a am 358d45e3: am c2ad0fb7: am 6903fb53: am 52a2733a: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev by Daniel Xie · 9 years ago
  49. 86f8b07 am fbd2753f: resolved conflicts for a8ab57fe to klp-modular-dev by Yin-Chia Yeh · 9 years ago
  50. 06a310d am 344a8b06: am 329be38a: am 334be519: am beaa1c12: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev by Daniel Xie · 9 years ago
  51. 2f505ef am 0a0bec55: resolved conflicts for 1168206d to klp-modular-dev by Unsuk Jung · 9 years ago
  52. 7beb087 am a9853b0a: am 34f2fab8: am 9b5c55e2: am 76c8e3d5: Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev automerge: ca0d846 automerge: 30e83c0 by Daniel Xie · 9 years ago
  53. 57a9328 am 66c72bb4: am babbb90e: am 897fe389: am 1aa503cc: Merge "Revert "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail"" into jb-mr1.1-cts-dev automerge: 7e9df5b automerge: e167a31 by Daniel Xie · 9 years ago
  54. d9312d1 am 71ef9586: am 72172502: am 12ac02b6: am de566354: Merge "Adding 53024, NZC as it does not support report delivery." into kitkat-cts-dev by Daniel Xie · 9 years ago
  55. 0f694d4 am 57dd0679: am c1798a5a: am fbfa5f93: am 53fbbd05: 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 by Daniel Xie · 9 years ago
  56. 79b8a7a am 42a968d3: am 0e3b22b3: am d460a355: am 52948ac4: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev by Daniel Xie · 9 years ago
  57. 1e8b274 am cc077750: am 71c5c3cc: am 8984ed1c: am 3aac281f: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev by Daniel Xie · 9 years ago
  58. 72ffb41 am 3297b259: am e4ff0843: am f394d10b: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev by Daniel Xie · 9 years ago
  59. 5d2795d am dac290d5: am 7e6de2f2: am c59abe4b: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev by Daniel Xie · 9 years ago
  60. 061f7ae am 3eaefd66: am c501a856: am 67168984: Merge "fix audio policy service binder security tests." into kitkat-cts-dev by Daniel Xie · 9 years ago
  61. f4b129f am 5f60500b: am 2ac7db23: am 4a53e934: Merge "Changed the size of MockView according to resolution." into kitkat-cts-dev by Daniel Xie · 9 years ago
  62. 0c3fb21 am 9cd2cdb4: am 022864a1: am aea6a23f: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev by Daniel Xie · 9 years ago
  63. dc43e0e am d590f90c: am d38598c1: am dcf21f46: Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev by Daniel Xie · 9 years ago
  64. 358d45e am c2ad0fb7: am 6903fb53: am 52a2733a: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev by Daniel Xie · 9 years ago
  65. 25a380e resolved conflicts for 5bc69858 to lmp-dev by Unsuk Jung · 9 years ago
  66. fbd2753 resolved conflicts for a8ab57fe to klp-modular-dev by Yin-Chia Yeh · 9 years ago
  67. fd868af Merge "resolved conflicts for 90647f20 to lmp-dev" into lmp-dev by Unsuk Jung · 9 years ago
  68. 080490e am 30044c61: Change SELinux neverallow tests to be sepolicy-analyze based. by dcashman · 9 years ago
  69. f47c1f7 am d101eb99: Merge "Tests for LauncherApps" into lmp-sprout-dev by Kenny Guy · 9 years ago
  70. 92b57d4 am 3c0ee9bf: Enable Enterprise CTS tests by Rubin Xu · 9 years ago
  71. 1a8885c am 4cd407f4: Merge "Fix testBatchAndFlushWithMutipleSensors to handle cases where the device supports only one continuous mode sensor." into lmp-sprout-dev by Aravind Akella · 9 years ago
  72. 9df43f0 am 6b2811eb: Merge "PresentationSyncTest: disable faster-than-refresh case" into lmp-sprout-dev by Jesse Hall · 9 years ago
  73. 7a1d92f am 6913fe63: Make testSetTextLong() wait for its work to finish. by Roozbeh Pournader · 9 years ago
  74. be61051 am 5bbff433: Merge "Slightly relax the timeout condition for testMinimumDownload" into lmp-sprout-dev by Takayuki Hoshi · 9 years ago
  75. c471683 am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev by Takayuki Hoshi · 9 years ago
  76. 5de4691 am 0b355c80: CamcorderProfileTest: fix the last timelapse id value by Zhijun He · 9 years ago
  77. a7c029f am f024450f: media: release decoder explicitly instead of relying on GC. by Ronghua Wu · 9 years ago
  78. d983a70 am 47bd0a79: Merge "Camera: assign tonemap keys to right capability" into lmp-sprout-dev by Yin-Chia Yeh · 9 years ago
  79. 9948460 am 23e37975: Merge "Fix the lock task cts test." into lmp-sprout-dev by Nicolas Prevot · 9 years ago
  80. 58b5ca1 am e1873274: Relax /dev/diag test by Nick Kralevich · 9 years ago
  81. 7a9b79f resolved conflicts for 90647f20 to lmp-dev by Unsuk Jung · 9 years ago
  82. 344a8b0 am 329be38a: am 334be519: am beaa1c12: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev by Daniel Xie · 9 years ago
  83. 0a0bec5 resolved conflicts for 1168206d to klp-modular-dev by Unsuk Jung · 9 years ago
  84. f4d8853 am f45a7cc6: am 45004cb7: am 9ce0873c: am 4d7e03fc: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev by Daniel Xie · 9 years ago
  85. a66f06e am fa71ec25: am f1ba62b4: am ef1481dc: am ba39064d: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev by Daniel Xie · 9 years ago
  86. 44cfb34 am fe88ec43: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev by Unsuk Jung · 9 years ago
  87. c9d1fff am 3856616b: am 391ac7d4: am ef902753: am 73965a87: Merge "set delay during testPerformFiltering" into kitkat-cts-dev by Lance Jin-woong Chang · 9 years ago
  88. bd5746c am 5e86f0bf: am 5a6f4f38: am 74a3ed18: am 16763e64: Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev by Daniel Xie · 9 years ago
  89. 58041e0 resolved conflicts for 7a31d618 to lmp-dev by Unsuk Jung · 9 years ago
  90. a9853b0 am 34f2fab8: am 9b5c55e2: am 76c8e3d5: Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev automerge: ca0d846 automerge: 30e83c0 by Daniel Xie · 9 years ago
  91. 66c72bb am babbb90e: am 897fe389: am 1aa503cc: Merge "Revert "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail"" into jb-mr1.1-cts-dev automerge: 7e9df5b automerge: e167a31 by Daniel Xie · 9 years ago
  92. 71ef958 am 72172502: am 12ac02b6: am de566354: Merge "Adding 53024, NZC as it does not support report delivery." into kitkat-cts-dev by Daniel Xie · 9 years ago
  93. 57dd067 am c1798a5a: am fbfa5f93: am 53fbbd05: 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
  94. 955b1c3 am 22dafe47: am bd524065: am c73d8100: Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue" into jb-mr2-cts-dev automerge: fcd7cb7 by Daniel Xie · 9 years ago
  95. 42a968d am 0e3b22b3: am d460a355: am 52948ac4: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev by Daniel Xie · 9 years ago
  96. 6fa1086 am f70ce3e2: am 52415d8c: am 3efc0e57: Merge "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail" into jb-mr1.1-cts-dev automerge: b28682b automerge: 7032ac7 by Daniel Xie · 9 years ago
  97. cc07775 am 71c5c3cc: am 8984ed1c: am 3aac281f: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev by Daniel Xie · 9 years ago
  98. 5bc6985 am 3cac2cc7: am 3b7a3299: am 628c43ab: Merge "Use Supported Camera resolution." into kitkat-cts-dev by Daniel Xie · 9 years ago
  99. ecce8ed am 38febf23: am 3c13e1f8: am 36db51ef: Merge "Remove bad test cases from MemoryFileTest." into kitkat-cts-dev by Daniel Xie · 9 years ago
  100. 90647f2 am b98c265b: am e6e09fd3: am f34f3767: Merge "Skip encoding tests for unsupported resolutions." into kitkat-cts-dev by Daniel Xie · 9 years ago