1. 0f2d188 resolve merge conflicts of 9735273 to nyc-mr1-dev-plus-aosp by Narayan Kamath · 8 years ago
  2. 9735273 resolve merge conflicts of 6884ed3 to nyc-dev-plus-aosp by Narayan Kamath · 8 years ago
  3. 2486026 Revert "Manually merge commit 'd3d4725f08ac2f27368cda123e87751231c9bd14' into nyc-dev" by Stephen Li · 8 years ago
  4. d9006ca Revert "Manually merge commit 'd3d4725f08ac2f27368cda123e87751231c9bd14' into nyc-dev" by Stephen Li · 8 years ago
  5. f194968 Move cts_audio_quality off abandoned tinyxml. by Elliott Hughes · 8 years ago
  6. 5650bbc Switch CTS to std::unique_ptr. by Elliott Hughes · 8 years ago
  7. e54e9a6 Fix clang-tidy warnings in audio_quality. by Chih-Hung Hsieh · 8 years ago
  8. 15d2854 Merge "Fix makefile issues with cts_audio_quality" am: a3f1340ef2 am: 8ed4b13201 by Dan Willemsen · 8 years ago
  9. c099d05 Fix makefile issues with cts_audio_quality by Dan Willemsen · 8 years ago
  10. d556411 Merge "audio/Buffer: Fix memset in constructor" into nyc-dev am: 8d5aea59bb by Greg Kaiser · 8 years ago
  11. 1f9bba8 audio/Buffer: Fix memset in constructor by Greg Kaiser · 8 years ago
  12. 41c7653 Merge "cts: Make Thread::run threadName argument required" into nyc-dev by Brian Carlstrom · 8 years ago
  13. bf652e7 cts: Make Thread::run threadName argument required by Brian Carlstrom · 8 years ago
  14. 17b90c6 Merge "Build only the first arch for cts_audio_quality_test" am: 0bbb8c196c by Ying Wang · 8 years ago
  15. ae66d22 Build only the first arch for cts_audio_quality_test by Ying Wang · 8 years ago
  16. 0208604 resolve merge conflicts of 9691efe1be to nyc-dev-plus-aosp by Dan Albert · 8 years ago
  17. 5ffe3d5 Stop hardcoding gtest headers/libs. by Dan Albert · 8 years ago
  18. 9e05e597 Fix media CTS to build with NDK by Brian Carlstrom · 9 years ago
  19. ba41b64 Merge "Fix a typo in comment (encoder -> decoder)" by Daniel Xie · 9 years ago
  20. 24330eb Merge "Remove in recipes" am: b44ac20b66 by Shinichiro Hamaji · 9 years ago
  21. 2e85014 Remove $(eval) in recipes by Shinichiro Hamaji · 9 years ago
  22. b280354 Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into lollipop-mr1-cts-dev am: f143e2cec9 am: 0c04dc907b am: 0534b90566 am: ece74522cb am: 18fef1d105 am: 32c9afc438 am: a3552b58ea by Daniel Xie · 9 years ago
  23. 18fef1d Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into lollipop-mr1-cts-dev am: f143e2cec9 am: 0c04dc907b am: 0534b90566 by Daniel Xie · 9 years ago
  24. 0534b90 Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into lollipop-mr1-cts-dev am: f143e2cec9 by Daniel Xie · 9 years ago
  25. 0c04dc9 Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into lollipop-mr1-cts-dev by Daniel Xie · 9 years ago
  26. 25a419a Merge "DO NOT MERGE Add running time hints to CTS package config" into mnc-dev am: 0e4cf34f73 am: 23c9de03cc am: bf1dcfff89 by Daniel Xie · 9 years ago
  27. c004f8f TIF: Make sure that Cursor.moveToNext() is called before using Cursor by Dongwon Kang · 9 years ago
  28. 6aab9db DO NOT MERGE Add running time hints to CTS package config by Jed Estep · 9 years ago
  29. 72a821b Fix a typo in comment (encoder -> decoder) by Michal Piechowski · 9 years ago
  30. 24fd578 Migrate video tests to cts_v2 by Aaron Holden · 9 years ago
  31. b84baa2 Merge "Migrate TV Provider tests to cts_v2" by Aaron Holden · 9 years ago
  32. 7e9317b Migrate TV Provider tests to cts_v2 by Aaron Holden · 9 years ago
  33. ecda1b3 Migrate simplecpu tests to cts_v2 by Aaron Holden · 9 years ago
  34. 7597fc4 am 1afcb793: am dd40d693: am 1cf83956: Merge "Use all-subdir-cpp-files" by Dan Willemsen · 9 years ago
  35. 1afcb79 am dd40d693: am 1cf83956: Merge "Use all-subdir-cpp-files" by Dan Willemsen · 9 years ago
  36. dd40d69 am 1cf83956: Merge "Use all-subdir-cpp-files" by Dan Willemsen · 9 years ago
  37. 414c086 Use all-subdir-cpp-files by Dan Willemsen · 9 years ago
  38. bb21234 Migrate Jank, OpenGl, and UI tests to CTSv2 by Stuart Scott · 9 years ago
  39. 032bb92 am 5e7398e9: am b8bc4cd5: am e0529c2c: am 587fe1bf: am 0906a6e8: Fix merge conflict resolution in e8eded12e2d66c59b8ccb950867d447be67bfb68 by Brian Carlstrom · 9 years ago
  40. 5e7398e am b8bc4cd5: am e0529c2c: am 587fe1bf: am 0906a6e8: Fix merge conflict resolution in e8eded12e2d66c59b8ccb950867d447be67bfb68 by Brian Carlstrom · 9 years ago
  41. 0906a6e Fix merge conflict resolution in e8eded12e2d66c59b8ccb950867d447be67bfb68 by Brian Carlstrom · 9 years ago
  42. dac5ad2 am af32257c: am fa6c1539: am 97836b1e: am 80c60902: am e8eded12: resolved conflicts for 4c7fd94a to mnc-dev by Daniel Xie · 9 years ago
  43. af32257 am fa6c1539: am 97836b1e: am 80c60902: am e8eded12: resolved conflicts for 4c7fd94a to mnc-dev by Daniel Xie · 9 years ago
  44. e8eded1 resolved conflicts for 4c7fd94a to mnc-dev by Daniel Xie · 9 years ago
  45. 4e5cc1c resolved conflicts for 12aba5ff to lmp-mr1-app-dev by Daniel Xie · 9 years ago
  46. 12aba5f DO NOT MERGE: fix breakage by Daniel Xie · 9 years ago
  47. 64b4550 DO NOT MERGE ANYWHERE: Merge commit '7679e48230a3b2ddb530c6626825fd7bd854bd24' into manual_merge_7679e482 by Daniel Xie · 9 years ago
  48. 64d4c87 Merge commit '451b577ddfde5496c447f939051287e825d37c55' into m by Daniel Xie · 9 years ago
  49. e4036fe Migrate file system tests to CTSv2 by Stuart Scott · 9 years ago
  50. aca7e8c Merge "Migrate dram tests to CTSv2" by Stuart Scott · 9 years ago
  51. 2c993ed Migrate Browser tests to CTSv2 by Stuart Scott · 9 years ago
  52. 5d50999 Migrate dram tests to CTSv2 by Stuart Scott · 9 years ago
  53. f02ace3 am 3c8fd6d3: resolved conflicts for 1b8460f7 to lmp-mr1-dev by Unsuk Jung · 9 years ago
  54. d95836a am 79d97606: Merge "CtsDeviceVideoPerf: limit bitrate to main or baseline profiles" into lollipop-cts-dev by Daniel Xie · 9 years ago
  55. 3c8fd6d resolved conflicts for 1b8460f7 to lmp-mr1-dev by Unsuk Jung · 9 years ago
  56. 8b0bdea resolved conflicts for f7e37679 to lmp-dev by Unsuk Jung · 9 years ago
  57. f7e3767 am 8022911e: am 013fe123: am ef92ab37: Merge "Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue" into kitkat-cts-dev by Daniel Xie · 9 years ago
  58. d728ee9 am 0a055193: am 5756df86: am b7b163d5: am 7db91bc4: am 92a7dc58: Merge "Move EGL setup to separate function." into mnc-dev by Kalle Raita · 9 years ago
  59. 0a05519 am 5756df86: am b7b163d5: am 7db91bc4: am 92a7dc58: Merge "Move EGL setup to separate function." into mnc-dev by Kalle Raita · 9 years ago
  60. 4b4a0f6 Move EGL setup to separate function. by Kalle Raita · 9 years ago
  61. c15ba04 am 115596ec: am e7c5ea85: am 4be0dcde: am 4b218b9b: am 80b13757: Merge "media: log result raw data in test error message" into mnc-dev by Ronghua Wu · 9 years ago
  62. 115596e am e7c5ea85: am 4be0dcde: am 4b218b9b: am 80b13757: Merge "media: log result raw data in test error message" into mnc-dev by Ronghua Wu · 9 years ago
  63. c7cfe1c am 80b13757: Merge "media: log result raw data in test error message" into mnc-dev by Ronghua Wu · 9 years ago
  64. 33f40de media: log result raw data in test error message by Ronghua Wu · 9 years ago
  65. da15daf am dfc8120b: am b447a891: am 6afa8fb4: am 20dfdc18: am f87279c6: Merge "media: combine log to reduce the size" into mnc-dev by Ronghua Wu · 9 years ago
  66. dfc8120 am b447a891: am 6afa8fb4: am 20dfdc18: am f87279c6: Merge "media: combine log to reduce the size" into mnc-dev by Ronghua Wu · 9 years ago
  67. ee1e917 am f87279c6: Merge "media: combine log to reduce the size" into mnc-dev by Ronghua Wu · 9 years ago
  68. f87279c Merge "media: combine log to reduce the size" into mnc-dev by Ronghua Wu · 9 years ago
  69. f9aea79 am 2bd501c4: am 7e9fc6b8: am f6e99cb6: am 1286e313: am e770e1cf: Merge "videoperf: end the decoder test if exceed the time limit." into mnc-dev by Ronghua Wu · 9 years ago
  70. 2bd501c am 7e9fc6b8: am f6e99cb6: am 1286e313: am e770e1cf: Merge "videoperf: end the decoder test if exceed the time limit." into mnc-dev by Ronghua Wu · 9 years ago
  71. 11c8c85 media: combine log to reduce the size by Ronghua Wu · 9 years ago
  72. f92cac8 am e770e1cf: Merge "videoperf: end the decoder test if exceed the time limit." into mnc-dev by Ronghua Wu · 9 years ago
  73. 9e4bea2 videoperf: end the decoder test if exceed the time limit. by Ronghua Wu · 9 years ago
  74. 980c859 am 3822bcc2: am 6c630a33: am 122d508c: am 3d0a35ac: am d114860e: Merge "videoperf: compute measured fps from frame time diff" into mnc-dev by Ronghua Wu · 9 years ago
  75. 3822bcc am 6c630a33: am 122d508c: am 3d0a35ac: am d114860e: Merge "videoperf: compute measured fps from frame time diff" into mnc-dev by Ronghua Wu · 9 years ago
  76. 76e95d7 am d114860e: Merge "videoperf: compute measured fps from frame time diff" into mnc-dev by Ronghua Wu · 9 years ago
  77. 6352ed0 videoperf: compute measured fps from frame time diff by Ronghua Wu · 9 years ago
  78. c881497 am 2b72d2c2: am c212874d: am 1cb9427b: am 71a1ea67: Merge "DO NOT MERGE videoperf: switch to use DeviceReportLog" into mnc-dev by Ronghua Wu · 9 years ago
  79. 84f2ccc am 71a1ea67: Merge "DO NOT MERGE videoperf: switch to use DeviceReportLog" into mnc-dev by Ronghua Wu · 9 years ago
  80. d68bd2f DO NOT MERGE videoperf: switch to use DeviceReportLog by Ronghua Wu · 9 years ago
  81. 5517a9a videoperf: switch to use DeviceReportLog by Ronghua Wu · 9 years ago
  82. fa09387 am 118a22a6: am 6a138cde: am d53bbeed: am 31f37674: am 3e81d4ee: Merge "videoperf: remove raw data logging" into mnc-dev by Ronghua Wu · 9 years ago
  83. 118a22a am 6a138cde: am d53bbeed: am 31f37674: am 3e81d4ee: Merge "videoperf: remove raw data logging" into mnc-dev by Ronghua Wu · 9 years ago
  84. bdf23f3 am 3e81d4ee: Merge "videoperf: remove raw data logging" into mnc-dev by Ronghua Wu · 9 years ago
  85. 81ef6de videoperf: remove raw data logging by Ronghua Wu · 9 years ago
  86. 4018fe5 resolved conflicts for merge of 79acc746 to master by Ronghua Wu · 9 years ago
  87. 388eb99 Dont report raw data. by Stuart Scott · 9 years ago
  88. 79acc74 am e5e515f7: am 2cea7e84: am 76e9138f: am 94541e38: Merge "videoperf: specify timeout for VideoEncoderDecoderTest" into mnc-dev by Ronghua Wu · 9 years ago
  89. ee0aae9 am 94541e38: Merge "videoperf: specify timeout for VideoEncoderDecoderTest" into mnc-dev by Ronghua Wu · 9 years ago
  90. f23fc99 videoperf: specify timeout for VideoEncoderDecoderTest by Ronghua Wu · 9 years ago
  91. 6e99547 Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue by jungyee.yoo · 10 years ago
  92. 205ddd3 Fix build break introduced during resolving merge-conflict by Dongwon Kang · 9 years ago
  93. ac7bd64 resolved conflicts for merge of 8735aa6d to master by Dongwon Kang · 9 years ago
  94. 8735aa6 am b8d95757: am 95d27bd3: am 84f15d2b: am 0badf11f: am d1442e1c: am 9f9c04f9: am f52749d3: am 28129e86: Merge "TIF: add query perf tests for a channel/program Uri in TvProviderPerfTest" into lollipop-mr1-cts-dev by Dongwon Kang · 9 years ago
  95. 9902139 am 0badf11f: am d1442e1c: am 9f9c04f9: am f52749d3: am 28129e86: Merge "TIF: add query perf tests for a channel/program Uri in TvProviderPerfTest" into lollipop-mr1-cts-dev by Dongwon Kang · 9 years ago
  96. 0badf11 am d1442e1c: am 9f9c04f9: am f52749d3: am 28129e86: Merge "TIF: add query perf tests for a channel/program Uri in TvProviderPerfTest" into lollipop-mr1-cts-dev by Dongwon Kang · 9 years ago
  97. 9f9c04f am f52749d3: am 28129e86: Merge "TIF: add query perf tests for a channel/program Uri in TvProviderPerfTest" into lollipop-mr1-cts-dev by Dongwon Kang · 9 years ago
  98. 707b543 Remove target from ReportLog and handle serializing/parsing with XML. by Stuart Scott · 9 years ago
  99. 92423df Revert "Revert "Moving to common compatibility utils."" by Stuart Scott · 9 years ago
  100. 0d1e548 Merge "Revert "Moving to common compatibility utils."" by Ian Pedowitz · 9 years ago