1. 3b51079 Merge "resolve merge conflicts of 49daa6e6db to mnc-dev." into mnc-dev by Daniel Xie · 9 years ago
  2. 2116c3c resolve merge conflicts of 49daa6e6db to mnc-dev. by Daniel Xie · 9 years ago
  3. 49daa6e Merge "CameraITS: use linear tonemap in test_exposure" into lollipop-mr1-cts-dev am: 37ece1e93c am: f4cda1d27f by Daniel Xie · 9 years ago
  4. be983a2 Merge "DO NOT MERGE Add running time hints to CTS package config" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  5. 40385a3 Merge "CameraITS: use linear tonemap in test_exposure" into lollipop-mr1-cts-dev am: 37ece1e93c by Daniel Xie · 9 years ago
  6. f4cda1d Merge "CameraITS: use linear tonemap in test_exposure" into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  7. 32ffe70 Merge "DO NOT MERGE Add running time hints to CTS package config" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  8. 90cbf47 DO NOT MERGE Add running time hints to CTS package config by Jed Estep · 9 years ago
  9. 37ece1e Merge "CameraITS: use linear tonemap in test_exposure" into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  10. 6dcff9f CameraITS: use linear tonemap in test_exposure by Gaurav Batra · 9 years ago
  11. 9005c3a Merge "DO NOT MERGE: Adding testConnectivityConstraintExecutes_withMobile to knownfailure list." into marshmallow-cts-dev by Daniel Xie · 9 years ago
  12. 4709b1c Merge "DO NOT MERGE: Adding testConnectivityConstraintExecutes_withMobile to knownfailure list." into marshmallow-cts-dev by Daniel Xie · 9 years ago
  13. 16a9ec8 DO NOT MERGE: Adding testConnectivityConstraintExecutes_withMobile by Daniel Xie · 9 years ago
  14. 3afdf50 Merge "Adding testConnectivityConstraintExecutes_withMobile to knownfailure list." into mnc-dev by Daniel Xie · 9 years ago
  15. ace696d Adding testConnectivityConstraintExecutes_withMobile to knownfailure list. by Daniel Xie · 9 years ago
  16. 6f7d88c Merge "DO NOT MERGE CTS version is now 6.0_r1.5" into mnc-dev by Daniel Xie · 9 years ago
  17. 032fd6b DO NOT MERGE CTS version is now 6.0_r1.5 by Daniel Xie · 9 years ago
  18. 0e4cf34 Merge "DO NOT MERGE Add running time hints to CTS package config" into mnc-dev by Daniel Xie · 9 years ago
  19. 63ee118 Merge "Stop android.print tests from executing if the device does not support print." into marshmallow-cts-dev by Daniel Xie · 9 years ago
  20. 37ae3d0 Merge "AudioRecordTest: Remove assert check on cold input start time" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  21. 874629e Merge "Stop android.print tests from executing if the device does not support print." into marshmallow-cts-dev by Daniel Xie · 9 years ago
  22. 1273b56 Merge "AudioRecordTest: Remove assert check on cold input start time" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  23. 37b9b9b AudioRecordTest: Remove assert check on cold input start time by Andy Hung · 9 years ago
  24. f7f7d59 Stop android.print tests from executing if the device does not support print. by Michael Kwan · 9 years ago
  25. 0bdf105 Merge "Restrict telephony.cts.CellInfoTest to Devices with FEATURE_TELEPHONY" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  26. e98f4d9 Merge "Restrict telephony.cts.CellInfoTest to Devices with FEATURE_TELEPHONY" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  27. 761b466 Restrict telephony.cts.CellInfoTest to Devices with FEATURE_TELEPHONY by Nathan Harold · 9 years ago
  28. 6aab9db DO NOT MERGE Add running time hints to CTS package config by Jed Estep · 9 years ago
  29. 676aa1d Merge remote-tracking branch \'goog/mnc-cts-release\' into HEAD am: 79a816d6c0 by Bill Yi · 9 years ago
  30. 79a816d Merge remote-tracking branch 'goog/mnc-cts-release' into HEAD by Bill Yi · 9 years ago
  31. c53e9d6 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a am: 44c25a44ae am: c28826b915 am: 949e8249c4 am: a12dea8428 am: f234f41b50 am: 49d36c3313 by Daniel Xie · 9 years ago
  32. 5ef197e Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae am: 7f14a76e9c am: c9c7b3a5ad am: bfeea01aa2 am: 4d409ca18e by Daniel Xie · 9 years ago
  33. 4b2e76b Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a am: 44c25a44ae am: c28826b915 am: 949e8249c4 am: a12dea8428 am: f234f41b50 by Daniel Xie · 9 years ago
  34. c90c930 Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae am: 7f14a76e9c am: c9c7b3a5ad am: bfeea01aa2 by Daniel Xie · 9 years ago
  35. 49d36c3 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a am: 44c25a44ae am: c28826b915 am: 949e8249c4 am: a12dea8428 by Daniel Xie · 9 years ago
  36. 4d409ca Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae am: 7f14a76e9c am: c9c7b3a5ad by Daniel Xie · 9 years ago
  37. f234f41 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a am: 44c25a44ae am: c28826b915 am: 949e8249c4 by Daniel Xie · 9 years ago
  38. bfeea01 Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae am: 7f14a76e9c by Daniel Xie · 9 years ago
  39. a12dea8 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a am: 44c25a44ae am: c28826b915 by Daniel Xie · 9 years ago
  40. 949e824 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a am: 44c25a44ae by Daniel Xie · 9 years ago
  41. c28826b Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a by Daniel Xie · 9 years ago
  42. 44c25a4 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb by Daniel Xie · 9 years ago
  43. bad28d5 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb by Daniel Xie · 9 years ago
  44. 2df3fc6 Merge "Fix SeedTest for landscape" into kitkat-cts-dev by Daniel Xie · 9 years ago
  45. c9c7b3a Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae by Daniel Xie · 9 years ago
  46. 7f14a76 Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 by Daniel Xie · 9 years ago
  47. a3012f2 Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 by Daniel Xie · 9 years ago
  48. d51f2f6 Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac by Daniel Xie · 9 years ago
  49. 4434dae Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac by Daniel Xie · 9 years ago
  50. 4791dcb Merge "Squashed commit of the following:" into kitkat-cts-dev by Daniel Xie · 9 years ago
  51. ffc3697 Squashed commit of the following: by Marco Nelissen · 9 years ago
  52. 074594d Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0 -s ours am: a22efb407b am: e880e62e4b by Daniel Xie · 9 years ago
  53. e5364a0 Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0 -s ours am: a22efb407b by Daniel Xie · 9 years ago
  54. e880e62 Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0 -s ours by Daniel Xie · 9 years ago
  55. a22efb4 Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  56. 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
  57. d67e2c4 Merge "testReleaseAfterFlush: extend to audio encoders" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  58. f390974 Merge "testDecodeAfterFlush: extend to audio" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  59. 5f07bef Merge "testReleaseAfterFlush: extend to audio encoders" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  60. e138dac Merge "testDecodeAfterFlush: extend to audio" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  61. 8e4f86d am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 09f4380657 -s ours am: c17d5c4f3f am: a44564e6c0 am: 3332e427c4 am: ac464002d3 by Daniel Xie · 9 years ago
  62. bdb5a21 am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 09f4380657 -s ours am: c17d5c4f3f am: a44564e6c0 am: 3332e427c4 by Daniel Xie · 9 years ago
  63. ac46400 am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 09f4380657 -s ours am: c17d5c4f3f am: a44564e6c0 by Daniel Xie · 9 years ago
  64. 3332e42 am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 09f4380657 -s ours am: c17d5c4f3f by Daniel Xie · 9 years ago
  65. a44564e am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 09f4380657 -s ours by Daniel Xie · 9 years ago
  66. c17d5c4 am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev by Daniel Xie · 9 years ago
  67. b01e365 Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df am: 518668280d am: 7158f893b1 by Daniel Xie · 9 years ago
  68. f7c3e99 Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df am: 518668280d by Daniel Xie · 9 years ago
  69. 7158f89 Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df by Daniel Xie · 9 years ago
  70. 5186682 Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  71. d301957 testReleaseAfterFlush: extend to audio encoders by Robert Shih · 9 years ago
  72. a41d497 Squashed mnc-dev changes: by Daniel Xie · 9 years ago
  73. 1a9e4e5 testDecodeAfterFlush: extend to audio by Robert Shih · 9 years ago
  74. 09f4380 am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev by Daniel Xie · 9 years ago
  75. 837e940 am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev by Daniel Xie · 9 years ago
  76. a06ee83 am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev by Daniel Xie · 9 years ago
  77. 227b641 Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev by Daniel Xie · 9 years ago
  78. 791e51a Merge "security: Test mediaserver crash against an invalid MIDI file" into mnc-dev by Wonsik Kim · 9 years ago
  79. 0fda173 security: Test mediaserver crash against an invalid MIDI file by Wonsik Kim · 9 years ago
  80. 79081ef resolve merge conflicts of 07b3ebc3d3 to mnc-dev. by Zoltan Szatmary-Ban · 9 years ago
  81. 07b3ebc Merge "Use requestNetwork with all transport types that hardware features report" into marshmallow-cts-dev by szatmz · 9 years ago
  82. 3de2d8d Merge "In tests tearDown() method, ignore IllegalArgumentException from unregisterReceiver method. Sometimes the tests may have failed to register a receiver. In such cases, trying to unregister it later on in tearDown() is unnecessary and so ignore IllegalArgumentException from unregisterReceiver." into marshmallow-cts-dev by Daniel Xie · 9 years ago
  83. 79a4153 Merge "In tests tearDown() method, ignore IllegalArgumentException from unregisterReceiver method. Sometimes the tests may have failed to register a receiver. In such cases, trying to unregister it later on in tearDown() is unnecessary and so ignore IllegalArgumentException from unregisterReceiver." into mnc-dev by Daniel Xie · 9 years ago
  84. 279c620 Merge "In tests tearDown() method, ignore IllegalArgumentException from unregisterReceiver method. Sometimes the tests may have failed to register a receiver. In such cases, trying to unregister it later on in tearDown() is unnecessary and so ignore IllegalArgumentException from unregisterReceiver." into marshmallow-cts-dev by Daniel Xie · 9 years ago
  85. 859f10d In tests tearDown() method, ignore IllegalArgumentException by Vasu Nori · 9 years ago
  86. 4fc7782 Merge "Capture Build.VERSION.BASE_OS and Build.VERISON.SECURITY_PATCH" into mnc-dev by Stuart Scott · 9 years ago
  87. 27da12f Merge "[devicepolicy] More complete test of CaCert API" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  88. 66963f6 Merge "[devicepolicy] More complete test of CaCert API" into marshmallow-cts-dev by Daniel Xie · 9 years ago
  89. a8e55d2 Merge "Fix test incompatibilities with Nemo (watch) device." into mnc-dev by Paul Mclean · 9 years ago
  90. 7fe1f92 DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam by Alex Chau · 9 years ago
  91. f55c3f6 Use requestNetwork with all transport types that hardware features report by Zoltan Szatmary-Ban · 9 years ago
  92. 2975486 am b078b54e: am feeded47: am 2149e97a: am 4d5913ff: am e95788b7: am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  93. b078b54 am feeded47: am 2149e97a: am 4d5913ff: am e95788b7: am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  94. feeded4 am 2149e97a: am 4d5913ff: am e95788b7: am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  95. 2149e97 am 4d5913ff: am e95788b7: am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  96. 4d5913f am e95788b7: am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  97. e95788b am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  98. d5c8733 am e913a7aa: am 79b7ea9f: am cef64655: am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev by Daniel Xie · 9 years ago
  99. 8bc09df am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev by Daniel Xie · 9 years ago
  100. e913a7a am 79b7ea9f: am cef64655: am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev by Daniel Xie · 9 years ago