1. ed87d93 resolve merge conflicts of b9492b5fe94cb99b5f79964a49313b451b2bc1a4 to oc-mr1-dev by Myles Watson · 7 years ago
  2. b9492b5 Bluetooth: Relax NO_OP and SCO checks am: 8a28de7a8c am: c2ec353810 by Myles Watson · 7 years ago
  3. c2ec353 Bluetooth: Relax NO_OP and SCO checks am: 8a28de7a8c by Myles Watson · 7 years ago
  4. 8a28de7 Bluetooth: Relax NO_OP and SCO checks by Myles Watson · 8 years ago
  5. 03fa85d thermal: fix VTS test for default implementation am: 3e4a4ce3ae am: 967a68dc84 by Polina Bondarenko · 7 years ago
  6. 9345792 thermal: fix VTS test for default implementation am: 3e4a4ce3ae am: c76249045b by Polina Bondarenko · 7 years ago
  7. 6dfdada thermal: fix VTS test for default implementation am: 3e4a4ce3ae am: 967a68dc84 by Polina Bondarenko · 7 years ago
  8. 967a68d thermal: fix VTS test for default implementation am: 3e4a4ce3ae by Polina Bondarenko · 7 years ago
  9. c762490 thermal: fix VTS test for default implementation am: 3e4a4ce3ae by Polina Bondarenko · 7 years ago
  10. 3e4a4ce thermal: fix VTS test for default implementation by Polina Bondarenko · 8 years ago
  11. c87295e Merge "Merge "Add None into cancelPendingUssd" into oreo-vts-dev am: 4ccc3b0140 am: 630eb2d3b8 am: f447fd054d" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  12. 4e5479d Merge "Add None into cancelPendingUssd" into oreo-vts-dev am: 4ccc3b0140 am: 630eb2d3b8 by sqian · 8 years ago
  13. e7da333 Merge "Add None into cancelPendingUssd" into oreo-vts-dev am: 4ccc3b0140 by sqian · 8 years ago
  14. f447fd0 Merge "Add None into cancelPendingUssd" into oreo-vts-dev am: 4ccc3b0140 by sqian · 8 years ago
  15. 630eb2d Merge "Add None into cancelPendingUssd" into oreo-vts-dev am: 4ccc3b0140 by sqian · 8 years ago
  16. efebbbe Merge "Add None into cancelPendingUssd" into oreo-vts-dev am: 4ccc3b0140 by sqian · 8 years ago
  17. 4ccc3b0 Merge "Add None into cancelPendingUssd" into oreo-vts-dev by Treehugger Robot · 8 years ago
  18. 2f1ec9e Merge "DO NOT MERGE Resolve merge conflict for VtsHalCameraProviderV2_4TargetTest.cpp" into oreo-vts-dev am: c85833780f -s ours by Keun Soo Yim · 8 years ago
  19. 4502be6 Merge "bug fix: close file pointer" into oreo-vts-dev am: e4fb4e20e7 -s ours by Ram Mohan M · 8 years ago
  20. b1a0257 Audio policy config: remove cross-module device port name uniqueness am: 079fdeb1d1 -s ours by Kevin Rocard · 8 years ago
  21. cc2a6a3 Merge "DO NOT MERGE Resolve merge conflict for VtsHalCameraProviderV2_4TargetTest.cpp" into oreo-vts-dev am: c85833780f -s ours am: eebf378ccf by Keun Soo Yim · 8 years ago
  22. d213620 Merge "bug fix: close file pointer" into oreo-vts-dev am: e4fb4e20e7 -s ours am: 13d2ddbaf8 -s ours by Ram Mohan M · 8 years ago
  23. 5c8f4fa Audio policy config: remove cross-module device port name uniqueness am: 079fdeb1d1 -s ours am: a38ef105b6 -s ours by Kevin Rocard · 8 years ago
  24. 4b4f6e6 Merge "DO NOT MERGE Resolve merge conflict for VtsHalCameraProviderV2_4TargetTest.cpp" into oreo-vts-dev am: c85833780f -s ours by Keun Soo Yim · 8 years ago
  25. d37bd7a Merge "bug fix: close file pointer" into oreo-vts-dev am: e4fb4e20e7 -s ours by Ram Mohan M · 8 years ago
  26. b6d2d04 Audio policy config: remove cross-module device port name uniqueness am: 079fdeb1d1 -s ours by Kevin Rocard · 8 years ago
  27. eebf378 Merge "DO NOT MERGE Resolve merge conflict for VtsHalCameraProviderV2_4TargetTest.cpp" into oreo-vts-dev by Keun Soo Yim · 8 years ago
  28. 13d2ddb Merge "bug fix: close file pointer" into oreo-vts-dev am: e4fb4e20e7 -s ours by Ram Mohan M · 8 years ago
  29. a38ef10 Audio policy config: remove cross-module device port name uniqueness by Kevin Rocard · 8 years ago
  30. 59e97b0 Merge "DO NOT MERGE Resolve merge conflict for VtsHalCameraProviderV2_4TargetTest.cpp" into oreo-vts-dev by Keun Soo Yim · 8 years ago
  31. c6b7256 Merge "bug fix: close file pointer" into oreo-vts-dev am: e4fb4e20e7 -s ours by Ram Mohan M · 8 years ago
  32. 73f2fd9 Audio policy config: remove cross-module device port name uniqueness by Kevin Rocard · 8 years ago
  33. c858337 Merge "DO NOT MERGE Resolve merge conflict for VtsHalCameraProviderV2_4TargetTest.cpp" into oreo-vts-dev by Treehugger Robot · 8 years ago
  34. e4fb4e2 Merge "bug fix: close file pointer" into oreo-vts-dev by Treehugger Robot · 8 years ago
  35. 079fdeb Audio policy config: remove cross-module device port name uniqueness by Kevin Rocard · 8 years ago
  36. 6729c05 bug fix: close file pointer by Ram Mohan M · 8 years ago
  37. 7d39f9e DO NOT MERGE Resolve merge conflict for VtsHalCameraProviderV2_4TargetTest.cpp by Keun Soo Yim · 8 years ago
  38. c9e0716 [automerger] Audio HAL: Allow setters to not be implemented am: 5b21eaa608 -s ours am: 448f7a8058 am: fd5987c9cc by Android Build Merger (Role) · 8 years ago
  39. fd5987c [automerger] Audio HAL: Allow setters to not be implemented am: 5b21eaa608 -s ours am: 448f7a8058 by Android Build Merger (Role) · 8 years ago
  40. 448f7a8 Audio HAL: Allow setters to not be implemented am: 5b21eaa608 -s ours by Kevin Rocard · 8 years ago
  41. 6e291df [automerger] Merge "Audio VTS: HAL can support more than the native sampling rates" into oreo-vts-dev am: 96b6fcdc4f -s ours am: 764ea58b98 am: 43fc06d03d by Android Build Merger (Role) · 8 years ago
  42. 43fc06d [automerger] Merge "Audio VTS: HAL can support more than the native sampling rates" into oreo-vts-dev am: 96b6fcdc4f -s ours am: 764ea58b98 by Android Build Merger (Role) · 8 years ago
  43. 764ea58 Merge "Audio VTS: HAL can support more than the native sampling rates" into oreo-vts-dev by Kevin Rocard · 8 years ago
  44. e6307ff [automerger] Audio policy config: Device port (type,address) must be unique am: 117188b315 -s ours am: 805062aa31 am: 51c2c54392 by Android Build Merger (Role) · 8 years ago
  45. 51c2c54 [automerger] Audio policy config: Device port (type,address) must be unique am: 117188b315 -s ours am: 805062aa31 by Android Build Merger (Role) · 8 years ago
  46. 805062a Audio policy config: Device port (type,address) must be unique by Kevin Rocard · 8 years ago
  47. 07699f7 [automerger] Audio policy config: allow vendor to extend module name am: eb488fad65 -s ours am: 3764dfa28f am: 540de3a27f by Android Build Merger (Role) · 8 years ago
  48. 540de3a [automerger] Audio policy config: allow vendor to extend module name am: eb488fad65 -s ours am: 3764dfa28f by Android Build Merger (Role) · 8 years ago
  49. 3764dfa Audio policy config: allow vendor to extend module name am: eb488fad65 -s ours by Kevin Rocard · 8 years ago
  50. dfacd70 [automerger] Set time delay in the vts test setup am: d4c4a4edfb -s ours am: 17103557d9 am: 2c0c7355cd by Android Build Merger (Role) · 8 years ago
  51. 2c0c735 [automerger] Set time delay in the vts test setup am: d4c4a4edfb -s ours am: 17103557d9 by Android Build Merger (Role) · 8 years ago
  52. 1710355 Set time delay in the vts test setup am: d4c4a4edfb -s ours by sqian · 8 years ago
  53. a1f8560 [automerger] Loosen speed check for first GPS location am: bf4f6db431 -s ours am: 92a385d5bf am: ba61d42c60 by Android Build Merger (Role) · 8 years ago
  54. ba61d42 [automerger] Loosen speed check for first GPS location am: bf4f6db431 -s ours am: 92a385d5bf by Android Build Merger (Role) · 8 years ago
  55. 92a385d Loosen speed check for first GPS location am: bf4f6db431 -s ours by Wyatt Riley · 8 years ago
  56. 7c98012 [automerger] Add tests to validate key length for clearkey plugin. am: c312e21b5e -s ours am: 00b66950cb am: 319065b756 by Android Build Merger (Role) · 8 years ago
  57. 319065b [automerger] Add tests to validate key length for clearkey plugin. am: c312e21b5e -s ours am: 00b66950cb by Android Build Merger (Role) · 8 years ago
  58. 00b6695 Add tests to validate key length for clearkey plugin. am: c312e21b5e -s ours by Edwin Wong · 8 years ago
  59. 01afd8c [automerger skipped] Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts tests am: 1d93dbfb3b -s ours skipped: 5cc34dd7df skipped: 5fb2147899 by Android Build Merger (Role) · 8 years ago
  60. 40c4ff7 Add None into cancelPendingUssd by sqian · 8 years ago
  61. 5fb2147 [automerger skipped] Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts tests am: 1d93dbfb3b -s ours skipped: 5cc34dd7df by Android Build Merger (Role) · 8 years ago
  62. 5cc34dd Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts tests am: 1d93dbfb3b -s ours by sqian · 8 years ago
  63. ef9d405 Merge "Audio HAL: Allow setters to not be implemented am: 5b21eaa608 -s ours am: ec65974f60 -s ours" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  64. 7802d1b Audio HAL: Allow setters to not be implemented am: 5b21eaa608 -s ours by Kevin Rocard · 8 years ago
  65. 871f8e4 Merge "Merge "Audio VTS: HAL can support more than the native sampling rates" into oreo-vts-dev am: 96b6fcdc4f -s ours am: 0b304504b5 -s ours" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  66. 810b5b3 Merge "Audio VTS: HAL can support more than the native sampling rates" into oreo-vts-dev am: 96b6fcdc4f -s ours by Kevin Rocard · 8 years ago
  67. 8f8e3e4 Merge "Audio policy config: Device port (type,address) must be unique am: 117188b315 -s ours am: f4f190fd03 -s ours" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  68. c7df1d0 Audio policy config: Device port (type,address) must be unique am: 117188b315 -s ours by Kevin Rocard · 8 years ago
  69. 0f97d8f Merge "Audio policy config: allow vendor to extend module name am: eb488fad65 -s ours am: 6834a7bea7 -s ours" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  70. 40013ef Audio policy config: allow vendor to extend module name am: eb488fad65 -s ours by Kevin Rocard · 8 years ago
  71. 7aa6eea Merge "Set time delay in the vts test setup am: d4c4a4edfb -s ours am: 633778a470 -s ours" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  72. 0d48025 Set time delay in the vts test setup am: d4c4a4edfb -s ours by sqian · 8 years ago
  73. a8f125f Merge "Loosen speed check for first GPS location am: bf4f6db431 -s ours am: f657ce53b4 -s ours" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  74. 0bc6e9e Loosen speed check for first GPS location am: bf4f6db431 -s ours by Wyatt Riley · 8 years ago
  75. 21ac066 Merge "Add tests to validate key length for clearkey plugin. am: c312e21b5e -s ours am: 4a9b599f9a -s ours" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  76. 73bb243 Add tests to validate key length for clearkey plugin. am: c312e21b5e -s ours by Edwin Wong · 8 years ago
  77. 6dc35f0 Merge changes from topic "am-c310f9b4-18a7-4504-8179-49be1ab1d4a7" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  78. 1f657da Merge "Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts tests am: 1d93dbfb3b -s ours am: b2b0cd70fa -s ours" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  79. de21da7 Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts tests am: 1d93dbfb3b -s ours by sqian · 8 years ago
  80. df88b40 [automerger] Fix VTS test which turns off radio. am: 71620817a9 -s ours am: 986facc698 am: 379ad11204 by Android Build Merger (Role) · 8 years ago
  81. 379ad11 [automerger] Fix VTS test which turns off radio. am: 71620817a9 -s ours am: 986facc698 by Android Build Merger (Role) · 8 years ago
  82. 9cfdb08 Merge "Fix VTS test which turns off radio. am: 71620817a9 -s ours am: 0cc426f287 -s ours" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  83. a1a7a56 Fix VTS test which turns off radio. am: 71620817a9 -s ours by Sanket Padawe · 8 years ago
  84. 68fc8a9 Merge "VTS: fix VtsHalKeymasterV3_0Target issue am: af5fad4036 -s ours am: 2af656a3ea" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  85. b84f2a8 VTS: fix VtsHalKeymasterV3_0Target issue am: af5fad4036 -s ours am: 2af656a3ea by Iris Chang · 8 years ago
  86. 986facc Fix VTS test which turns off radio. am: 71620817a9 -s ours by Sanket Padawe · 8 years ago
  87. db14d3a Merge changes from topic "am-c3548d64-0940-4c1d-b786-8c3f6bfc3870" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  88. d7f0e66 Audio VTS: do not test duplicate policy configuration file am: 68d4dd6e85 -s ours by Kevin Rocard · 8 years ago
  89. 947ce71 [automerger] VTS: fix VtsHalKeymasterV3_0Target issue am: af5fad4036 am: 349de81afa am: dcccdb5450 by Android Build Merger (Role) · 8 years ago
  90. dcccdb5 [automerger] VTS: fix VtsHalKeymasterV3_0Target issue am: af5fad4036 am: 349de81afa by Android Build Merger (Role) · 8 years ago
  91. 4235f7f Audio VTS: remove expectation of policy configuration unicity am: 9c4e363a70 -s ours by Kevin Rocard · 8 years ago
  92. 349de81 VTS: fix VtsHalKeymasterV3_0Target issue am: af5fad4036 by Iris Chang · 8 years ago
  93. 679910b [automerger] Audio VTS: do not test duplicate policy configuration file am: 68d4dd6e85 -s ours am: c78afae8ee am: 518b71a623 by Android Build Merger (Role) · 8 years ago
  94. 518b71a [automerger] Audio VTS: do not test duplicate policy configuration file am: 68d4dd6e85 -s ours am: c78afae8ee by Android Build Merger (Role) · 8 years ago
  95. c78afae Audio VTS: do not test duplicate policy configuration file by Kevin Rocard · 8 years ago
  96. ec65974 Audio HAL: Allow setters to not be implemented am: 5b21eaa608 -s ours by Kevin Rocard · 8 years ago
  97. d92e09a Merge "Allow partially dynamic profile in the audio policy config am: e54b381d9d -s ours am: 615a9a5925 -s ours" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  98. 8a550cb Allow partially dynamic profile in the audio policy config am: e54b381d9d -s ours by Kevin Rocard · 8 years ago
  99. 7e51e86 Merge changes from topic "am-37f5fd31-e121-420d-a199-6bb9d1bbf861" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  100. 591caae Merge "bug fix: restore support for broken flag am: 8d009afdbb -s ours am: fecadf319e -s ours" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago