1. bf3a0de resolve merge conflicts of 8fcf74f948f8167db3a2f6f5e846c74e9eeedfec to pi-dev-plus-aosp by Andreas Gampe · 7 years ago
  2. 976dd37 Merge "cts: add more verifications for HeifWriter" into pi-dev am: 3d9b31eb94 by Chong Zhang · 7 years ago
  3. dec1275 Merge "AssumptionViolatedException is not handled correctly in @After" into pi-dev by android-build-team Robot · 7 years ago
  4. 3d9b31e Merge "cts: add more verifications for HeifWriter" into pi-dev by Chong Zhang · 7 years ago
  5. d046a44 Merge "AssumptionViolatedException is not handled correctly in @After" into pi-dev by android-build-team Robot · 7 years ago
  6. 0e89786 Merge "move cts-instant*.xml into new config location" into pi-dev by android-build-team Robot · 7 years ago
  7. b168733 Merge "move cts-instant*.xml into new config location" into pi-dev by android-build-team Robot · 7 years ago
  8. ca42bb5 move cts-instant*.xml into new config location by Guang Zhu · 7 years ago
  9. 8fcf74f Merge "Drop CtsLibcoreJavaUtilCollectionTestCases." am: 22f6a42b2a by Tobias Thierer · 7 years ago
  10. 2eee546 Merge "[automerger skipped] Merge "convert leanbackjank to aapt2" am: f9074b62ca am: 49c43cd52a -s ours" into pi-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  11. 71da11f Merge "Improved assertDatasets() so it retries when the values didn't change yet." into pi-dev by android-build-team Robot · 7 years ago
  12. 5f3062a [automerger skipped] Merge "convert leanbackjank to aapt2" am: f9074b62ca by Colin Cross · 7 years ago
  13. fc3b16a Merge "Fixed virtual activity tests to always use its assertDatasetShown() method." into pi-dev by android-build-team Robot · 7 years ago
  14. 19fc29f Merge "Before/AfterClass need to be static." into pi-dev am: 5fe5af9ae9 by android-build-team Robot · 7 years ago
  15. 3056004 Merge "Improved assertDatasets() so it retries when the values didn't change yet." into pi-dev by android-build-team Robot · 7 years ago
  16. b86cf09 Merge "Fixed virtual activity tests to always use its assertDatasetShown() method." into pi-dev by android-build-team Robot · 7 years ago
  17. 5fe5af9 Merge "Before/AfterClass need to be static." into pi-dev by android-build-team Robot · 7 years ago
  18. 22f6a42 Merge "Drop CtsLibcoreJavaUtilCollectionTestCases." by Tobias Thierer · 7 years ago
  19. 1091e08 Merge "Fix TelephonyManagerTest#testListen" into pi-dev am: 076998a12d by android-build-team Robot · 7 years ago
  20. 49c43cd Merge "convert leanbackjank to aapt2" am: f9074b62ca by Colin Cross · 7 years ago
  21. 076998a Merge "Fix TelephonyManagerTest#testListen" into pi-dev by android-build-team Robot · 7 years ago
  22. 96d0425 Before/AfterClass need to be static. by Jeff Sharkey · 7 years ago
  23. ec720fc Merge "[Harness Separation] Move tools/cts-test-metrics and tools/dex-tools" into pi-dev by Fang Deng · 7 years ago
  24. 8e558c6 Merge "[Harness Separation] Fix some references to tools/cts-tradefed" into pi-dev by android-build-team Robot · 7 years ago
  25. 79e3946 Merge "[Harness Separation] Move tools/cts-test-metrics and tools/dex-tools" into pi-dev by Fang Deng · 7 years ago
  26. a9781f4 Merge "[Harness Separation] Fix some references to tools/cts-tradefed" into pi-dev by android-build-team Robot · 7 years ago
  27. f9074b6 Merge "convert leanbackjank to aapt2" by Colin Cross · 7 years ago
  28. 8951115 AssumptionViolatedException is not handled correctly in @After by Ng Zhi An · 7 years ago
  29. 9600f12 Merge "Fix race condition between waitToFinishRendering and onSurfaceCreated" am: a2355856df by Dimitry Ivanov · 7 years ago
  30. aa1af93 Merge "Fix race condition between waitToFinishRendering and onSurfaceCreated" by Dimitry Ivanov · 7 years ago
  31. a235585 Merge "Fix race condition between waitToFinishRendering and onSurfaceCreated" by Dimitry Ivanov · 7 years ago
  32. 93eebdd Fix race condition between waitToFinishRendering and onSurfaceCreated by dimitry · 7 years ago
  33. dffc254 Merge "Fix race condition between waitToFinishRendering and onSurfaceCreated" into pi-dev by android-build-team Robot · 7 years ago
  34. 60d6410 Merge "Fix race condition between waitToFinishRendering and onSurfaceCreated" into pi-dev by android-build-team Robot · 7 years ago
  35. b3729ff [Harness Separation] Fix some references to tools/cts-tradefed by Fang Deng · 7 years ago
  36. 3e44eed [Harness Separation] Move tools/cts-test-metrics and tools/dex-tools by Fang Deng · 7 years ago
  37. b978ed6 cts: add more verifications for HeifWriter by Chong Zhang · 7 years ago
  38. be12791 Merge "move Monitor into TestUtils" into pi-dev am: 59d1aa9a94 by android-build-team Robot · 7 years ago
  39. 59d1aa9 Merge "move Monitor into TestUtils" into pi-dev by android-build-team Robot · 7 years ago
  40. 58ba743 Improved assertDatasets() so it retries when the values didn't change yet. by Felipe Leme · 7 years ago
  41. 380e600 move Monitor into TestUtils by Wei Jia · 7 years ago
  42. af69722 [automerger skipped] Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591" into oc-dev am: 41e52fe9cd -s ours am: 981961cb4d -s ours am: fba2aa165c -s ours by android-build-team Robot · 7 years ago
  43. 939dacf [automerger skipped] Merge changes from topic "am-dab9d9ee-921b-4bf5-ac9a-268f4b518eee" into oc-dev am: 9c1ff9ce09 -s ours am: 7a13f2131b -s ours am: 4b793b2384 -s ours by android-build-team Robot · 7 years ago
  44. 916d77a [automerger skipped] Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591" into oc-dev am: 41e52fe9cd -s ours am: 981961cb4d -s ours by android-build-team Robot · 7 years ago
  45. 4ea76c8 [automerger skipped] [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 0854b1133e am: 288c4b4a7d am: 21ad4cd75c am: 0fb5f33635 skipped: eb5a0d4c5f am: 7557c3c0ce am: 60cb496ab7 am: 61e0ae2c1b -s ours by Gautam · 7 years ago
  46. 59545f7 [automerger skipped] Merge changes from topic "am-dab9d9ee-921b-4bf5-ac9a-268f4b518eee" into oc-dev am: 9c1ff9ce09 -s ours am: 7a13f2131b -s ours by android-build-team Robot · 7 years ago
  47. fba2aa1 [automerger skipped] Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591" into oc-dev am: 41e52fe9cd -s ours by android-build-team Robot · 7 years ago
  48. 560d93e [automerger skipped] [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 0854b1133e am: 288c4b4a7d am: 21ad4cd75c am: 0fb5f33635 skipped: eb5a0d4c5f am: 7557c3c0ce am: 60cb496ab7 by Gautam · 7 years ago
  49. 384a56e Fixed virtual activity tests to always use its assertDatasetShown() method. by Felipe Leme · 7 years ago
  50. 4b793b2 [automerger skipped] Merge changes from topic "am-dab9d9ee-921b-4bf5-ac9a-268f4b518eee" into oc-dev am: 9c1ff9ce09 -s ours by android-build-team Robot · 7 years ago
  51. 61e0ae2 [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 0854b1133e am: 288c4b4a7d am: 21ad4cd75c am: 0fb5f33635 skipped: eb5a0d4c5f am: 7557c3c0ce by Gautam · 7 years ago
  52. 981961c [automerger skipped] Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591" into oc-dev by android-build-team Robot · 7 years ago
  53. 7a13f21 [automerger skipped] Merge changes from topic "am-dab9d9ee-921b-4bf5-ac9a-268f4b518eee" into oc-dev by android-build-team Robot · 7 years ago
  54. 983f84a Merge "CTS test for Android Security b/25765591" into pi-dev am: 3ba928bf3a by android-build-team Robot · 7 years ago
  55. 60cb496 [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 0854b1133e am: 288c4b4a7d am: 21ad4cd75c am: 0fb5f33635 skipped: eb5a0d4c5f by Gautam · 7 years ago
  56. f9aeebb Merge "Instant CTS: port fragment CTS tests" into pi-dev am: 11ee64a3b2 by Svetoslav Ganov · 7 years ago
  57. 41e52fe Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591" into oc-dev by android-build-team Robot · 7 years ago
  58. 3ba928b Merge "CTS test for Android Security b/25765591" into pi-dev by android-build-team Robot · 7 years ago
  59. 9c1ff9c Merge changes from topic "am-dab9d9ee-921b-4bf5-ac9a-268f4b518eee" into oc-dev by android-build-team Robot · 7 years ago
  60. 11ee64a Merge "Instant CTS: port fragment CTS tests" into pi-dev by Svetoslav Ganov · 7 years ago
  61. 0805d41 [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 by Gautam · 7 years ago
  62. 41304bc Merge "CameraITS: make scene3/test_3a_consistency MANDATORY" into pi-dev by android-build-team Robot · 7 years ago
  63. eee2a7a Merge "CameraITS: make scene3/test_3a_consistency MANDATORY" into pi-dev by android-build-team Robot · 7 years ago
  64. 7557c3c [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 0854b1133e am: 288c4b4a7d am: 21ad4cd75c am: 0fb5f33635 skipped: eb5a0d4c5f by Android Build Merger (Role) · 7 years ago
  65. eb5a0d4 [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 0854b1133e am: 288c4b4a7d am: 21ad4cd75c am: 0fb5f33635 by Android Build Merger (Role) · 7 years ago
  66. 0fb5f33 [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 0854b1133e am: 288c4b4a7d am: 21ad4cd75c by Android Build Merger (Role) · 7 years ago
  67. 21ad4cd [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 0854b1133e am: 288c4b4a7d by Android Build Merger (Role) · 7 years ago
  68. 288c4b4 [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 0854b1133e by Android Build Merger (Role) · 7 years ago
  69. cde880c Merge "Add tests to verify that WCG content is properly composited by TextureView." into pi-dev by Derek Sollenberger · 7 years ago
  70. b5e0eb3 Merge "Add tests to verify that WCG content is properly composited by TextureView." into pi-dev by Derek Sollenberger · 7 years ago
  71. 85e895b CameraITS: make scene3/test_3a_consistency MANDATORY by Clemenz Portmann · 7 years ago
  72. 79b999d Merge "Update tests for scheduled local relaunch" into pi-dev am: 23ddafa2e9 by Andrii Kulian · 7 years ago
  73. c4f5236 Merge "media: prepare for Codec 2.0" into pi-dev am: 9e4a3b8907 by android-build-team Robot · 7 years ago
  74. 23ddafa Merge "Update tests for scheduled local relaunch" into pi-dev by Andrii Kulian · 7 years ago
  75. 9e4a3b8 Merge "media: prepare for Codec 2.0" into pi-dev by android-build-team Robot · 7 years ago
  76. 6454351 CTS test for Android Security b/25765591 by Gautam · 7 years ago
  77. 0854b11 [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 by Gautam · 7 years ago
  78. ad48d4e [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 385aea95b4 am: 31b67e00e5 am: ba498c5153 skipped: 0ddb81c257 am: 1ee59bac6e am: 9a7d143854 am: dcb5819393 am: 15987a2798 skipped: 8c5098cec6 by Android Build Merger (Role) · 7 years ago
  79. 8c5098c [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 385aea95b4 am: 31b67e00e5 am: ba498c5153 skipped: 0ddb81c257 am: 1ee59bac6e am: 9a7d143854 am: dcb5819393 am: 15987a2798 by Android Build Merger (Role) · 7 years ago
  80. 15987a27 [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 385aea95b4 am: 31b67e00e5 am: ba498c5153 skipped: 0ddb81c257 am: 1ee59bac6e am: 9a7d143854 am: dcb5819393 by Android Build Merger (Role) · 7 years ago
  81. dcb5819 [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 385aea95b4 am: 31b67e00e5 am: ba498c5153 skipped: 0ddb81c257 am: 1ee59bac6e am: 9a7d143854 by Android Build Merger (Role) · 7 years ago
  82. 9a7d143 [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 385aea95b4 am: 31b67e00e5 am: ba498c5153 skipped: 0ddb81c257 am: 1ee59bac6e by Android Build Merger (Role) · 7 years ago
  83. 1ee59ba [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 385aea95b4 am: 31b67e00e5 am: ba498c5153 skipped: 0ddb81c257 by Android Build Merger (Role) · 7 years ago
  84. 0ddb81c [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 385aea95b4 am: 31b67e00e5 am: ba498c5153 by Android Build Merger (Role) · 7 years ago
  85. ba498c5 [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 385aea95b4 am: 31b67e00e5 by Android Build Merger (Role) · 7 years ago
  86. 31b67e0 [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 am: 385aea95b4 by Android Build Merger (Role) · 7 years ago
  87. 385aea9 [RESTRICT AUTOMERGE]: CTS test for Android Security b/25765591 by Gautam · 7 years ago
  88. 984e307 Merge "Extend sync CTS timeout" into pi-dev am: a3d07b8ceb by Makoto Onuki · 7 years ago
  89. a7d0e1f Fix TelephonyManagerTest#testListen by Roman Kiryanov · 7 years ago
  90. a3d07b8 Merge "Extend sync CTS timeout" into pi-dev by Makoto Onuki · 7 years ago
  91. ec80e63 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/29982686"" into oc-dev am: 384e74ea80 am: ed1795696f am: a23a8d752b -s ours by Ryan Longair · 7 years ago
  92. b4b8da9 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/29982686"" into oc-dev am: 384e74ea80 am: ed1795696f by Ryan Longair · 7 years ago
  93. a23a8d7 Merge "Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/29982686"" into oc-dev am: 384e74ea80 by Ryan Longair · 7 years ago
  94. ed17956 Merge "Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/29982686"" into oc-dev by Ryan Longair · 7 years ago
  95. 384e74e Merge "Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/29982686"" into oc-dev by Ryan Longair · 7 years ago
  96. 645a8c7 Instant CTS: port view CTS tests am: 93e2c56326 by Svet Ganov · 7 years ago
  97. c08f2f1 Instant CTS: port fragment CTS tests by Svet Ganov · 7 years ago
  98. 93e2c56 Instant CTS: port view CTS tests by Svet Ganov · 7 years ago
  99. 454fe30 Merge "Fix testSynthesizeToFile cts test" into pi-dev am: e1f4521e9b by android-build-team Robot · 7 years ago
  100. e1f4521 Merge "Fix testSynthesizeToFile cts test" into pi-dev by android-build-team Robot · 7 years ago