1. 34d6dce resolve merge conflicts of e35f6cfdc9 to nougat-mr1-cts-dev am: 695f27135b am: 64fab117a2 by Aaron Holden · 8 years ago
  2. a051fa3 resolve merge conflicts of e35f6cfdc9 to nougat-mr1-cts-dev am: 695f27135b by Aaron Holden · 8 years ago
  3. 64fab11 resolve merge conflicts of e35f6cfdc9 to nougat-mr1-cts-dev am: 695f27135b by Aaron Holden · 8 years ago
  4. 695f271 resolve merge conflicts of e35f6cfdc9 to nougat-mr1-cts-dev by Aaron Holden · 8 years ago
  5. 0c5e602 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev am: b1a97862a2 -s ours am: 62c6630c03 am: ca923d905f am: f05e1f8242 by Tina Zhou · 8 years ago
  6. 11e4dcd DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6 am: 894f7af479 -s ours am: 30483ca0d7 am: 83d0b0f7f6 -s ours am: 9a4f164c9b by tinazh · 8 years ago
  7. 7fb4348 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev am: b1a97862a2 -s ours" into nougat-mr1-cts-dev am: 84d9743846 -s ours am: 77b71894be by Tina Zhou · 8 years ago
  8. 76e1581 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev am: b1a97862a2 -s ours am: 30b4886017 -s ours am: f94d91b5c4 by Tina Zhou · 8 years ago
  9. 155807c Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6 am: 894f7af479 -s ours" into nougat-mr1-cts-dev am: ce3edda04f -s ours am: 9490887bc4 by tinazh · 8 years ago
  10. 1d2cd43 DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6 am: 894f7af479 -s ours am: 5ab255bcb4 -s ours am: ee7f7e3fac by tinazh · 8 years ago
  11. 19440fb Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: fad5398de5 am: cf2a6021d6 am: 5fe7870a08 am: 226ad6dc44 -s ours am: 12a6380740 am: 0e91dd76be am: fdfad5354a by Tina Zhou · 8 years ago
  12. 8a0d7b7 DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: e6e8171682 am: 1066a1cc2e am: 15b6e9813e am: df0ce29579 -s ours am: 8983b7cea8 am: 6dc0ed0341 am: 23de3af5b0 by tinazh · 8 years ago
  13. 02d2005 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours" into nougat-cts-dev am: 021fddf3fe -s ours am: adb60043f2 am: dc5fb92ce6 am: 75d58127a0 by Tina Zhou · 8 years ago
  14. a0eabb4 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: 7f203e5d1f -s ours am: 1795ae05dd am: e86f75e926 am: 5783ce6c82 by Tina Zhou · 8 years ago
  15. be9174c Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours" into nougat-cts-dev am: ff7ca12946 -s ours am: a08fa29bb4 am: bfb0853d29 am: e9146b71a6 by tinazh · 8 years ago
  16. 3f2d142 DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: 829395c187 -s ours am: fd87f1011b am: 3cdf7eeae2 am: 80c5ac48e4 by tinazh · 8 years ago
  17. c1630e0 Merge "[ITS] correct tile areas. Tiles are relative." into nougat-mr1-cts-dev am: 8bd1b69455 am: 61627c4bd7 by Clemenz Portmann · 8 years ago
  18. 7b13a53 [ITS] correct tile areas. Tiles are relative. am: 2a17045084 am: 77713ac5a5 by Clemenz Portmann · 8 years ago
  19. 80cbc04 Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours" into nougat-cts-dev am: 021fddf3fe -s ours" into nougat-mr1-cts-dev am: c47bae4586 -s ours am: 3b49ee5110 by Tina Zhou · 8 years ago
  20. fb6f70e Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours" into nougat-cts-dev am: 021fddf3fe -s ours am: 81620c6d52 -s ours am: 5b567b9e6c by Tina Zhou · 8 years ago
  21. 3cc5221 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: 7f203e5d1f -s ours" into nougat-mr1-cts-dev am: 342133f9b7 -s ours am: 6c12095322 by Tina Zhou · 8 years ago
  22. 04b9ec7 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: 7f203e5d1f -s ours am: 4c4a28cb3f -s ours am: a0a1ce2a09 by Tina Zhou · 8 years ago
  23. 25bbcab Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours" into nougat-cts-dev am: ff7ca12946 -s ours" into nougat-mr1-cts-dev am: 188dd9e1ad -s ours am: 623b2d6481 by tinazh · 8 years ago
  24. 1c2e327 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours" into nougat-cts-dev am: ff7ca12946 -s ours am: 6c2f52d8f2 -s ours am: a5d7aaf421 by tinazh · 8 years ago
  25. e175ce4 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: 829395c187 -s ours" into nougat-mr1-cts-dev am: e3d8fa244e -s ours am: 5d7eb11bd7 by tinazh · 8 years ago
  26. 6731e10 DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: 829395c187 -s ours am: 3ec2040d72 -s ours am: bf5d0859c5 by tinazh · 8 years ago
  27. b513f2f Merge "Do not turn Wifi off for sustained performance test" into nougat-mr1-cts-dev am: 1b5e1d1d53 am: f7f47ea989 by Tina Zhou · 8 years ago
  28. b17dbc4 Do not turn Wifi off for sustained performance test am: 842d02a386 am: 295b8c08db by Andres Oportus · 8 years ago
  29. 8a9c1e4 Merge "Use getLocationOnScreen to compute verification bitmap offset" into nougat-mr1-cts-dev am: acced3cb2b am: cef1627ef1 by Tina Zhou · 8 years ago
  30. f826beb Use getLocationOnScreen to compute verification bitmap offset am: 0f9ceac0ac am: da70e22887 by Yorke Lee · 8 years ago
  31. 1f9cca5 Merge "Update ApplicationTest for multi-window awareness" into nougat-mr1-cts-dev am: 8b4dc413c7 am: 0102046710 by Tina Zhou · 8 years ago
  32. bace445 Update ApplicationTest for multi-window awareness am: 3873e63664 am: 0397429e08 by Yorke Lee · 8 years ago
  33. b402bf1 Merge "CameraITS scene5 only read_3a is supported" into nougat-mr1-cts-dev am: 76460787d1 am: d77624bbc4 by Tina Zhou · 8 years ago
  34. bd0220d Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev am: b1a97862a2 -s ours am: 62c6630c03 am: ca923d905f by Tina Zhou · 8 years ago
  35. db234b3 DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6 am: 894f7af479 -s ours am: 30483ca0d7 am: 83d0b0f7f6 -s ours by tinazh · 8 years ago
  36. c9a9157 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev am: b1a97862a2 -s ours" into nougat-mr1-cts-dev am: 84d9743846 -s ours by Tina Zhou · 8 years ago
  37. cf5c326 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev am: b1a97862a2 -s ours am: 30b4886017 -s ours by Tina Zhou · 8 years ago
  38. 3e566ff Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6 am: 894f7af479 -s ours" into nougat-mr1-cts-dev am: ce3edda04f -s ours by tinazh · 8 years ago
  39. f05e1f8 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev am: b1a97862a2 -s ours am: 62c6630c03 by Tina Zhou · 8 years ago
  40. e7125e0 DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6 am: 894f7af479 -s ours am: 5ab255bcb4 -s ours by tinazh · 8 years ago
  41. 9a4f164 DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6 am: 894f7af479 -s ours am: 30483ca0d7 by tinazh · 8 years ago
  42. 77b7189 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev am: b1a97862a2 -s ours" into nougat-mr1-cts-dev by Tina Zhou · 8 years ago
  43. f94d91b Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev am: b1a97862a2 -s ours by Tina Zhou · 8 years ago
  44. 9490887 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6 am: 894f7af479 -s ours" into nougat-mr1-cts-dev by tinazh · 8 years ago
  45. ee7f7e3 DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6 am: 894f7af479 -s ours by tinazh · 8 years ago
  46. ca923d9 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev am: b1a97862a2 -s ours by Tina Zhou · 8 years ago
  47. 83d0b0f DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6 am: 894f7af479 -s ours by tinazh · 8 years ago
  48. 84d9743 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev am: b1a97862a2 -s ours" into nougat-mr1-cts-dev by Android Merger · 8 years ago
  49. ce3edda Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6 am: 894f7af479 -s ours" into nougat-mr1-cts-dev by Android Merger · 8 years ago
  50. 30b4886 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev by Tina Zhou · 8 years ago
  51. 5ab255b DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6 am: 894f7af479 -s ours by tinazh · 8 years ago
  52. 62c6630 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev by Tina Zhou · 8 years ago
  53. 30483ca DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6 am: 894f7af479 -s ours by tinazh · 8 years ago
  54. b1a9786 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r6" into nougat-cts-dev by Tina Zhou · 8 years ago
  55. 162848b resolve merge conflicts of b2a063181c to nyc-mr1-dev-plus-aosp by Yin-Chia Yeh · 8 years ago
  56. 4ddf270 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: fad5398de5 am: cf2a6021d6 am: 5fe7870a08 am: 226ad6dc44 -s ours am: 12a6380740 am: 0e91dd76be by Tina Zhou · 8 years ago
  57. eef921b DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: e6e8171682 am: 1066a1cc2e am: 15b6e9813e am: df0ce29579 -s ours am: 8983b7cea8 am: 6dc0ed0341 by tinazh · 8 years ago
  58. fdfad53 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: fad5398de5 am: cf2a6021d6 am: 5fe7870a08 am: 226ad6dc44 -s ours am: 12a6380740 by Tina Zhou · 8 years ago
  59. 23de3af DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: e6e8171682 am: 1066a1cc2e am: 15b6e9813e am: df0ce29579 -s ours am: 8983b7cea8 by tinazh · 8 years ago
  60. e35f6cf Redefine compatibility test not_executed counts, improve setDone by Aaron Holden · 8 years ago
  61. 6663a46 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours" into nougat-cts-dev am: 021fddf3fe -s ours am: adb60043f2 am: dc5fb92ce6 by Tina Zhou · 8 years ago
  62. 89a16cf Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: 7f203e5d1f -s ours am: 1795ae05dd am: e86f75e926 by Tina Zhou · 8 years ago
  63. 958e79c Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours" into nougat-cts-dev am: ff7ca12946 -s ours am: a08fa29bb4 am: bfb0853d29 by tinazh · 8 years ago
  64. 0e91dd7 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: fad5398de5 am: cf2a6021d6 am: 5fe7870a08 am: 226ad6dc44 -s ours by Tina Zhou · 8 years ago
  65. 4797bb3 DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: 829395c187 -s ours am: fd87f1011b am: 3cdf7eeae2 by tinazh · 8 years ago
  66. 6dc0ed0 DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: e6e8171682 am: 1066a1cc2e am: 15b6e9813e am: df0ce29579 -s ours by tinazh · 8 years ago
  67. ee3537c Merge "[ITS] correct tile areas. Tiles are relative." into nougat-mr1-cts-dev am: 8bd1b69455 by Clemenz Portmann · 8 years ago
  68. 0063358 [ITS] correct tile areas. Tiles are relative. am: 2a17045084 am: 77713ac5a5 by Clemenz Portmann · 8 years ago
  69. b3ce2d0 Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours" into nougat-cts-dev am: 021fddf3fe -s ours" into nougat-mr1-cts-dev am: c47bae4586 -s ours by Tina Zhou · 8 years ago
  70. 9366d1c Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours" into nougat-cts-dev am: 021fddf3fe -s ours am: 81620c6d52 -s ours by Tina Zhou · 8 years ago
  71. 75d5812 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours" into nougat-cts-dev am: 021fddf3fe -s ours am: adb60043f2 by Tina Zhou · 8 years ago
  72. 6b88aea Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: 7f203e5d1f -s ours" into nougat-mr1-cts-dev am: 342133f9b7 -s ours by Tina Zhou · 8 years ago
  73. 5783ce6 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: 7f203e5d1f -s ours am: 1795ae05dd by Tina Zhou · 8 years ago
  74. 01a0652 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: 7f203e5d1f -s ours am: 4c4a28cb3f -s ours by Tina Zhou · 8 years ago
  75. 12a6380 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: fad5398de5 am: cf2a6021d6 am: 5fe7870a08 by Tina Zhou · 8 years ago
  76. e9146b7 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours" into nougat-cts-dev am: ff7ca12946 -s ours am: a08fa29bb4 by tinazh · 8 years ago
  77. 01be4e8 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours" into nougat-cts-dev am: ff7ca12946 -s ours" into nougat-mr1-cts-dev am: 188dd9e1ad -s ours by tinazh · 8 years ago
  78. 8983b7c DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: e6e8171682 am: 1066a1cc2e am: 15b6e9813e by tinazh · 8 years ago
  79. 80c5ac4 DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: 829395c187 -s ours am: fd87f1011b by tinazh · 8 years ago
  80. 7b16501 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours" into nougat-cts-dev am: ff7ca12946 -s ours am: 6c2f52d8f2 -s ours by tinazh · 8 years ago
  81. afb1818 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: 829395c187 -s ours" into nougat-mr1-cts-dev am: e3d8fa244e -s ours by tinazh · 8 years ago
  82. cb606fb DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: 829395c187 -s ours am: 3ec2040d72 -s ours by tinazh · 8 years ago
  83. dc5fb92 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours" into nougat-cts-dev am: 021fddf3fe -s ours by Tina Zhou · 8 years ago
  84. 61627c4 Merge "[ITS] correct tile areas. Tiles are relative." into nougat-mr1-cts-dev by Clemenz Portmann · 8 years ago
  85. 77713ac [ITS] correct tile areas. Tiles are relative. am: 2a17045084 by Clemenz Portmann · 8 years ago
  86. e86f75e Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: 7f203e5d1f -s ours by Tina Zhou · 8 years ago
  87. 3b49ee5 Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours" into nougat-cts-dev am: 021fddf3fe -s ours" into nougat-mr1-cts-dev by Tina Zhou · 8 years ago
  88. 5b567b9 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours" into nougat-cts-dev am: 021fddf3fe -s ours by Tina Zhou · 8 years ago
  89. 226ad6d Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: fad5398de5 am: cf2a6021d6 by Tina Zhou · 8 years ago
  90. bfb0853 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours" into nougat-cts-dev am: ff7ca12946 -s ours by tinazh · 8 years ago
  91. 3cdf7ee DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: 829395c187 -s ours by tinazh · 8 years ago
  92. df0ce29 DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: e6e8171682 am: 1066a1cc2e by tinazh · 8 years ago
  93. 6c12095 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: 7f203e5d1f -s ours" into nougat-mr1-cts-dev by Tina Zhou · 8 years ago
  94. a0a1ce2 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: 7f203e5d1f -s ours by Tina Zhou · 8 years ago
  95. 623b2d6 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours" into nougat-cts-dev am: ff7ca12946 -s ours" into nougat-mr1-cts-dev by tinazh · 8 years ago
  96. a5d7aaf Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours" into nougat-cts-dev am: ff7ca12946 -s ours by tinazh · 8 years ago
  97. 5fe7870 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: fad5398de5 by Tina Zhou · 8 years ago
  98. 5d7eb11 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: 829395c187 -s ours" into nougat-mr1-cts-dev by tinazh · 8 years ago
  99. bf5d085 DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: 829395c187 -s ours by tinazh · 8 years ago
  100. 15b6e98 DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15 am: 1100322fee -s ours am: e6e8171682 by tinazh · 8 years ago