Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / cts / 11bfac079aa39142d21ce2d9d1e9745f31911569
  1. 11bfac0 Merge "[RESTRICT AUTOMERGE] STS retry issue: Clean up fingerprint handling to avoid checksum invalidation. Basically, we need the original device fingerprint when ensuring we have an eligible device fingerprint and the masked fingerprint when checksumming results." into oc-dev am: c20752cebb by Ryan Longair · 7 years ago
  2. a4cd41d Merge "[RESTRICT AUTOMERGE] STS retry issue: Clean up fingerprint handling to avoid checksum invalidation. Basically, we need the original device fingerprint when ensuring we have an eligible device fingerprint and the masked fingerprint when checksumming results." into oc-dev by Ryan Longair · 7 years ago
  3. c20752c Merge "[RESTRICT AUTOMERGE] STS retry issue: Clean up fingerprint handling to avoid checksum invalidation. Basically, we need the original device fingerprint when ensuring we have an eligible device fingerprint and the masked fingerprint when checksumming results." into oc-dev by TreeHugger Robot · 7 years ago
  4. a19c3a6 [automerger skipped] Merge "DO NOT MERGE Fix a timing bug, make sure to wait for home before asserting state" into oreo-mr1-cts-dev by zhangweiwei · 7 years ago
  5. 5d4b0b6 Merge "DO NOT MERGE Fix a timing bug, make sure to wait for home before asserting state" into oreo-mr1-cts-dev by Treehugger Robot · 7 years ago
  6. 5674986 DO NOT MERGE Fix a timing bug, make sure to wait for home before asserting state by zhangweiwei · 7 years ago
  7. fa225c1 [automerger skipped] Merge "DO NOT MERGE: CameraITS: support wide FoV ITS 20cm deep box" into oreo-cts-dev am: 6db0f5084e -s ours am: db0c2e2b97 by jungkyun.park · 7 years ago
  8. 0f48b25 Merge "Disable Bluetooth LE Client/Server test" into oreo-mr1-cts-dev by Jakub Pawlowski · 7 years ago
  9. d3f346e Merge "Disable Bluetooth LE Client/Server test" into oreo-mr1-cts-dev by Treehugger Robot · 7 years ago
  10. d228833 [automerger skipped] Merge "DO NOT MERGE: CameraITS: support wide FoV ITS 20cm deep box" into oreo-cts-dev am: 6db0f5084e -s ours by jungkyun.park · 7 years ago
  11. 63bd31d Merge "[automerger skipped] Merge "DO NOT MERGE: CameraITS: support wide FoV ITS 20cm deep box" into oreo-cts-dev am: 6db0f5084e -s ours" into oreo-mr1-cts-dev by jungkyun.park · 7 years ago
  12. 8f38117 [automerger skipped] Merge "DO NOT MERGE: CameraITS: support wide FoV ITS 20cm deep box" into oreo-mr1-cts-dev by jungkyun.park · 7 years ago
  13. db0c2e2 [automerger skipped] Merge "DO NOT MERGE: CameraITS: support wide FoV ITS 20cm deep box" into oreo-cts-dev by jungkyun.park · 7 years ago
  14. 9f3e99d Merge "[automerger skipped] Merge "DO NOT MERGE: CameraITS: support wide FoV ITS 20cm deep box" into oreo-cts-dev am: 6db0f5084e -s ours" into oreo-mr1-cts-dev by Android Merger · 7 years ago
  15. c0fd182 [automerger skipped] Merge "DO NOT MERGE: CameraITS: support wide FoV ITS 20cm deep box" into oreo-cts-dev by jungkyun.park · 7 years ago
  16. 8041eea Merge "DO NOT MERGE: CameraITS: support wide FoV ITS 20cm deep box" into oreo-mr1-cts-dev by Treehugger Robot · 7 years ago
  17. 6db0f50 Merge "DO NOT MERGE: CameraITS: support wide FoV ITS 20cm deep box" into oreo-cts-dev by Treehugger Robot · 7 years ago
  18. 8f4d15c DO NOT MERGE: CameraITS: support wide FoV ITS 20cm deep box by jungkyun.park · 7 years ago
  19. dc1d5df DO NOT MERGE: CameraITS: support wide FoV ITS 20cm deep box by jungkyun.park · 7 years ago
  20. 11b3415 [RESTRICT AUTOMERGE] STS retry issue: Clean up fingerprint handling by Ryan Longair · 7 years ago
  21. 872addd CTS test for Android Security b/32707507 b/72462011 am: 7355db2eac by Goraksh Shinde · 7 years ago
  22. 98fca10 CTS test for Android Security b/32707507 b/72462011 am: 7355db2eac by Goraksh Shinde · 7 years ago
  23. 7355db2 CTS test for Android Security b/32707507 b/72462011 by Goraksh Shinde · 7 years ago
  24. 460d985 [automerger skipped] Merge "DO NOT MERGE: Edit test case for non-handheld device." into oreo-cts-dev am: a6c95d2405 -s ours am: 2f4730d01f by Charlie Wang · 7 years ago
  25. 4d97482 [automerger skipped] Merge "DO NOT MERGE: Edit test case for non-handheld device." into oreo-cts-dev am: a6c95d2405 -s ours by Charlie Wang · 7 years ago
  26. 4ea1a15 Merge "[automerger skipped] Merge "DO NOT MERGE: Edit test case for non-handheld device." into oreo-cts-dev am: a6c95d2405 -s ours" into oreo-mr1-cts-dev by Charlie Wang · 7 years ago
  27. b82189c Merge "Fix cts failure about automotive navigationBar" into oreo-mr1-cts-dev by Yue, VincentX · 7 years ago
  28. 2f4730d [automerger skipped] Merge "DO NOT MERGE: Edit test case for non-handheld device." into oreo-cts-dev by Charlie Wang · 7 years ago
  29. b72935b Merge "[automerger skipped] Merge "DO NOT MERGE: Edit test case for non-handheld device." into oreo-cts-dev am: a6c95d2405 -s ours" into oreo-mr1-cts-dev by Android Merger · 7 years ago
  30. 1b1bd02 [automerger skipped] Merge "DO NOT MERGE: Edit test case for non-handheld device." into oreo-cts-dev by Charlie Wang · 7 years ago
  31. 156f2e4 Merge "Fix cts failure about automotive navigationBar" into oreo-mr1-cts-dev by Treehugger Robot · 7 years ago
  32. a6c95d2 Merge "DO NOT MERGE: Edit test case for non-handheld device." into oreo-cts-dev by Treehugger Robot · 7 years ago
  33. cd22249 [automerger] CTS test for Android Security b/72505291 b/30744884 am: a496c943d0 am: a5cdc1bc80 am: fb1b0fa19e am: 3db6c8f1c8 am: af08c7e2ed am: 0d8bbf5945 am: 471bd93fbc am: 13a31d7830 am: 658f02aec1 am: 949640f8ec by Sanjeev Kumar · 7 years ago
  34. 9c55b9b [automerger] CTS test for Android Security b/72505291 b/30744884 am: a496c943d0 am: a5cdc1bc80 am: fb1b0fa19e am: 3db6c8f1c8 am: af08c7e2ed am: 0d8bbf5945 am: 471bd93fbc am: 13a31d7830 am: 658f02aec1 by Sanjeev Kumar · 7 years ago
  35. 65c5dee DO NOT MERGE: Edit test case for non-handheld device. by Charlie Wang · 7 years ago
  36. 949640f [automerger] CTS test for Android Security b/72505291 b/30744884 am: a496c943d0 am: a5cdc1bc80 am: fb1b0fa19e am: 3db6c8f1c8 am: af08c7e2ed am: 0d8bbf5945 am: 471bd93fbc am: 13a31d7830 am: 658f02aec1 by Android Build Merger (Role) · 7 years ago
  37. 658f02a [automerger] CTS test for Android Security b/72505291 b/30744884 am: a496c943d0 am: a5cdc1bc80 am: fb1b0fa19e am: 3db6c8f1c8 am: af08c7e2ed am: 0d8bbf5945 am: 471bd93fbc am: 13a31d7830 by Android Build Merger (Role) · 7 years ago
  38. 13a31d7 [automerger] CTS test for Android Security b/72505291 b/30744884 am: a496c943d0 am: a5cdc1bc80 am: fb1b0fa19e am: 3db6c8f1c8 am: af08c7e2ed am: 0d8bbf5945 am: 471bd93fbc by Android Build Merger (Role) · 7 years ago
  39. 471bd93 [automerger] CTS test for Android Security b/72505291 b/30744884 am: a496c943d0 am: a5cdc1bc80 am: fb1b0fa19e am: 3db6c8f1c8 am: af08c7e2ed am: 0d8bbf5945 by Android Build Merger (Role) · 7 years ago
  40. 0d8bbf5 [automerger] CTS test for Android Security b/72505291 b/30744884 am: a496c943d0 am: a5cdc1bc80 am: fb1b0fa19e am: 3db6c8f1c8 am: af08c7e2ed by Android Build Merger (Role) · 7 years ago
  41. af08c7e [automerger] CTS test for Android Security b/72505291 b/30744884 am: a496c943d0 am: a5cdc1bc80 am: fb1b0fa19e am: 3db6c8f1c8 by Android Build Merger (Role) · 7 years ago
  42. 3db6c8f [automerger] CTS test for Android Security b/72505291 b/30744884 am: a496c943d0 am: a5cdc1bc80 am: fb1b0fa19e by Android Build Merger (Role) · 7 years ago
  43. fb1b0fa [automerger] CTS test for Android Security b/72505291 b/30744884 am: a496c943d0 am: a5cdc1bc80 by Android Build Merger (Role) · 7 years ago
  44. a5cdc1b [automerger] CTS test for Android Security b/72505291 b/30744884 am: a496c943d0 by Android Build Merger (Role) · 7 years ago
  45. a496c94 CTS test for Android Security b/72505291 b/30744884 by Sanjeev Kumar · 7 years ago
  46. ead18ca [automerger skipped] Merge "DO NOT MERGE - Do not test CTS case of testUnoccludeRotationChange for auto device." into oreo-mr1-cts-dev by bxu10x · 7 years ago
  47. a64d3d5 Merge "Remove android.telephony.action.SUBSCRIPTION_CARRIER_IDENTITY_CHANGED intent." into oreo-mr1-cts-dev by Joshua Schwarz · 7 years ago
  48. 8f4976d Merge "DO NOT MERGE - Do not test CTS case of testUnoccludeRotationChange for auto device." into oreo-mr1-cts-dev by Treehugger Robot · 7 years ago
  49. c4e9bb2 Merge "Remove android.telephony.action.SUBSCRIPTION_CARRIER_IDENTITY_CHANGED intent." into oreo-mr1-cts-dev by Treehugger Robot · 7 years ago
  50. 4370167 Merge "Make CTS test testQuery more flexible" into oreo-mr1-cts-dev by Fyodor Kupolov · 7 years ago
  51. 9cf3263 Merge "Make CTS test testQuery more flexible" into oreo-mr1-cts-dev by Treehugger Robot · 7 years ago
  52. 8a59229 Merge changes from topic "am-38e23b8a-80e5-44ec-b6c2-a782dd406cb9" into oc-dev am: 032246b20f by Karthick Pandiarajan · 7 years ago
  53. 90f5df5 Merge changes from topic "am-75de3733-3bb2-4927-89a7-1ff44748362a" into oc-dev am: 4240bdd483 by Karthick Pandiarajan · 7 years ago
  54. 7e542d1 Merge "CTS test for Android Security b/72507870 b/28740702" into oc-dev am: 72018c9244 by Karthick Pandiarajan · 7 years ago
  55. 9b0ca58 Merge "Merge "Merge "Merge "Make CTS test testQuery more flexible" into marshmallow-cts-dev am: 9990dedab5" into nougat-cts-dev am: 625c8ca8e9" into nougat-mr1-cts-dev am: e89422ac54" into oreo-cts-dev am: 628ef43532 am: d28b89abc1 by Fyodor Kupolov · 7 years ago
  56. a7d07be Merge "Merge "Merge "[automerger skipped] Merge "[DO NOT MERGE] Do not require hardware-bound RSA key support on M devices" into marshmallow-cts-dev am: 47e2366324 -s ours" into nougat-cts-dev am: 7b0082854f -s ours" into nougat-mr1-cts-dev am: aa2e1787b7 -s ours" into oreo-cts-dev am: 6d456e4138 -s ours am: 696d60afe5 by Rubin Xu · 7 years ago
  57. 4c03570 Merge changes from topic "am-38e23b8a-80e5-44ec-b6c2-a782dd406cb9" into oc-dev by Karthick Pandiarajan · 7 years ago
  58. 448a16e Merge changes from topic "am-75de3733-3bb2-4927-89a7-1ff44748362a" into oc-dev by Karthick Pandiarajan · 7 years ago
  59. 2f83735 Merge "CTS test for Android Security b/72507870 b/28740702" into oc-dev by Karthick Pandiarajan · 7 years ago
  60. 786b7c0 Merge "Merge "Merge "Merge "Make CTS test testQuery more flexible" into marshmallow-cts-dev am: 9990dedab5" into nougat-cts-dev am: 625c8ca8e9" into nougat-mr1-cts-dev am: e89422ac54" into oreo-cts-dev am: 628ef43532 by Fyodor Kupolov · 7 years ago
  61. a110bb6 Merge "Merge "Merge "[automerger skipped] Merge "[DO NOT MERGE] Do not require hardware-bound RSA key support on M devices" into marshmallow-cts-dev am: 47e2366324 -s ours" into nougat-cts-dev am: 7b0082854f -s ours" into nougat-mr1-cts-dev am: aa2e1787b7 -s ours" into oreo-cts-dev am: 6d456e4138 -s ours by Rubin Xu · 7 years ago
  62. b7f6878 Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r30" into marshmallow-cts-dev am: e7d20373d1 -s ours" into nougat-cts-dev am: 7f248a369e -s ours" into nougat-mr1-cts-dev am: 8430e6b300 -s ours" into oreo-cts-dev am: 5bd9c057e4 -s ours" into oc-dev am: 62d9a1db2f by agowdra · 7 years ago
  63. f98ace5 Merge changes from topic "am-f67bdbb4-2bbf-411e-a6ec-64000104a2a6" into oc-dev am: 80ae0a0600 by Fyodor Kupolov · 7 years ago
  64. 3d3bc24 Merge "Merge "Merge "resolve merge conflicts of ed60e055bd5ec64e8c74b79d8f23da259634e0c4 to nougat-cts-dev" into nougat-cts-dev am: dc2b4d9acf" into nougat-mr1-cts-dev am: 10b49e953b" into oreo-cts-dev am: 523a172e26 am: 31f9354dd9 by Nick Chalko · 7 years ago
  65. 032246b Merge changes from topic "am-38e23b8a-80e5-44ec-b6c2-a782dd406cb9" into oc-dev by TreeHugger Robot · 7 years ago
  66. b88d23d Merge changes from topic "am-38e23b8a-80e5-44ec-b6c2-a782dd406cb9" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  67. 4bb81ff Merge changes from topic "am-38e23b8a-80e5-44ec-b6c2-a782dd406cb9" into cw-f-dev by TreeHugger Robot · 7 years ago
  68. 67a7561 Merge changes from topic "am-38e23b8a-80e5-44ec-b6c2-a782dd406cb9" into nyc-mr1-dev by TreeHugger Robot · 7 years ago
  69. dc9ef2c Merge changes from topic "am-38e23b8a-80e5-44ec-b6c2-a782dd406cb9" into nyc-dr1-dev by TreeHugger Robot · 7 years ago
  70. 0624f88 Merge changes from topic "am-38e23b8a-80e5-44ec-b6c2-a782dd406cb9" into nyc-dev by TreeHugger Robot · 7 years ago
  71. 9fff94d Merge changes from topic "am-38e23b8a-80e5-44ec-b6c2-a782dd406cb9" into mnc-dr1.5-dev by TreeHugger Robot · 7 years ago
  72. 7f83a74 Merge changes from topic "am-38e23b8a-80e5-44ec-b6c2-a782dd406cb9" into cw-e-dev by TreeHugger Robot · 7 years ago
  73. b3faca9 Merge changes from topic "am-38e23b8a-80e5-44ec-b6c2-a782dd406cb9" into mnc-dr-dev by TreeHugger Robot · 7 years ago
  74. e010239 Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/72507870 b/28740702" into mnc-dev by TreeHugger Robot · 7 years ago
  75. 4240bdd Merge changes from topic "am-75de3733-3bb2-4927-89a7-1ff44748362a" into oc-dev by TreeHugger Robot · 7 years ago
  76. bbc0e30 Merge changes from topic "am-75de3733-3bb2-4927-89a7-1ff44748362a" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  77. 17b213f Merge changes from topic "am-75de3733-3bb2-4927-89a7-1ff44748362a" into cw-f-dev by TreeHugger Robot · 7 years ago
  78. 8ac69ad Merge changes from topic "am-75de3733-3bb2-4927-89a7-1ff44748362a" into nyc-mr1-dev by TreeHugger Robot · 7 years ago
  79. b32b4ef Merge "[RESTRICT AUTOMERGE]: CTS test for Android Security b/72507870 b/28740702" into nyc-dev by TreeHugger Robot · 7 years ago
  80. 72018c9 Merge "CTS test for Android Security b/72507870 b/28740702" into oc-dev by TreeHugger Robot · 7 years ago
  81. 18e4b09 [automerger skipped] Merge "Merge "[automerger skipped] Merge "[DO NOT MERGE] Do not require hardware-bound RSA key support on M devices" into marshmallow-cts-dev am: 47e2366324 -s ours" into nougat-cts-dev am: 7b0082854f -s ours" into nougat-mr1-cts-de skipped: eba62b5696 am: b4dc02d679 by Rubin Xu · 7 years ago
  82. 2da5d37 Merge "Merge "Merge "Merge "Merge "Merge "Make CTS test testQuery more flexible" into marshmallow-cts-dev am: 9990dedab5" into nougat-cts-dev am: 625c8ca8e9" into nougat-mr1-cts-dev am: e89422ac54" into oreo-cts-dev am: 628ef43532" into oreo-mr1-cts-dev am: 0366056a0e" into oc-mr1-dev by Android Build Merger (Role) · 7 years ago
  83. 7f2e0ed Merge "Merge "Merge "Merge "Merge "Make CTS test testQuery more flexible" into marshmallow-cts-dev am: 9990dedab5" into nougat-cts-dev am: 625c8ca8e9" into nougat-mr1-cts-dev am: e89422ac54" into oreo-cts-dev am: 628ef43532" into oreo-mr1-cts-dev by Fyodor Kupolov · 7 years ago
  84. 897b724 [automerger skipped] Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r30" into marshmallow-cts-dev am: e7d20373d1 -s ours" into nougat-cts-dev am: 7f248a369e -s ours" into nougat-mr1-cts-dev am: 8430e6b300 -s ou skipped: 30060592f9 am: 3718361d1d by agowdra · 7 years ago
  85. f211bb9 [automerger] Merge "Merge "resolve merge conflicts of ed60e055bd5ec64e8c74b79d8f23da259634e0c4 to nougat-cts-dev" into nougat-cts-dev am: dc2b4d9acf" into nougat-mr1-cts-dev am: 10b49e953b am: 19ae32abb6 am: bb0c08e74b am: c825268662 am: 9a0960c767 by Nick Chalko · 7 years ago
  86. 6f4fe4e Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r30" into marshmallow-cts-dev am: e7d20373d1 -s ours" into nougat-cts-dev am: 7f248a369e -s ours" into nougat-mr1-cts-dev am: 8430e6b300 -s ours" into oreo-cts-dev am: 5bd9c057e4 -s ours" into oc-dev by agowdra · 7 years ago
  87. 01ff74f Merge changes from topic "am-f67bdbb4-2bbf-411e-a6ec-64000104a2a6" into oc-dev by Fyodor Kupolov · 7 years ago
  88. c82a590 Merge "Merge "Merge "resolve merge conflicts of ed60e055bd5ec64e8c74b79d8f23da259634e0c4 to nougat-cts-dev" into nougat-cts-dev am: dc2b4d9acf" into nougat-mr1-cts-dev am: 10b49e953b" into oreo-cts-dev am: 523a172e26 by Nick Chalko · 7 years ago
  89. e7edcd7 [automerger skipped] Merge "Merge "[automerger skipped] Merge "[DO NOT MERGE] Do not require hardware-bound RSA key support on M devices" into marshmallow-cts-dev am: 47e2366324 -s ours" into nougat-cts-dev am: 7b0082854f -s ours" into nougat-mr1-cts-de skipped: eba62b5696 by Rubin Xu · 7 years ago
  90. 99ad928 [automerger skipped] Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r30" into marshmallow-cts-dev am: e7d20373d1 -s ours" into nougat-cts-dev am: 7f248a369e -s ours" into nougat-mr1-cts-dev am: 8430e6b300 -s ou skipped: 30060592f9 by agowdra · 7 years ago
  91. d28b89a Merge "Merge "Merge "Merge "Make CTS test testQuery more flexible" into marshmallow-cts-dev am: 9990dedab5" into nougat-cts-dev am: 625c8ca8e9" into nougat-mr1-cts-dev am: e89422ac54" into oreo-cts-dev by Fyodor Kupolov · 7 years ago
  92. 4abad19 [automerger] Merge "Merge "resolve merge conflicts of ed60e055bd5ec64e8c74b79d8f23da259634e0c4 to nougat-cts-dev" into nougat-cts-dev am: dc2b4d9acf" into nougat-mr1-cts-dev am: 10b49e953b am: 19ae32abb6 am: bb0c08e74b am: c825268662 by Nick Chalko · 7 years ago
  93. c109b32 Merge "Merge "Merge "Merge "[automerger skipped] Merge "[DO NOT MERGE] Do not require hardware-bound RSA key support on M devices" into marshmallow-cts-dev am: 47e2366324 -s ours" into nougat-cts-dev am: 7b0082854f -s ours" into nougat-mr1-cts-dev am: aa2e1787b7 -s ours" into oreo-cts-dev am: 6d456e4138 -s ours" into oreo-mr1-cts-dev by Rubin Xu · 7 years ago
  94. d2e7082 Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r30" into marshmallow-cts-dev am: e7d20373d1 -s ours" into nougat-cts-dev am: 7f248a369e -s ours" into nougat-mr1-cts-dev am: 8430e6b300 -s ours" into oreo-cts-dev am: 5bd9c057e4 -s ours" into oreo-mr1-cts-dev by agowdra · 7 years ago
  95. 32b6e28 Merge "Merge "Merge "Merge "resolve merge conflicts of ed60e055bd5ec64e8c74b79d8f23da259634e0c4 to nougat-cts-dev" into nougat-cts-dev am: dc2b4d9acf" into nougat-mr1-cts-dev am: 10b49e953b" into oreo-cts-dev am: 523a172e26" into oreo-mr1-cts-dev by Nick Chalko · 7 years ago
  96. 696d60a Merge "Merge "Merge "[automerger skipped] Merge "[DO NOT MERGE] Do not require hardware-bound RSA key support on M devices" into marshmallow-cts-dev am: 47e2366324 -s ours" into nougat-cts-dev am: 7b0082854f -s ours" into nougat-mr1-cts-dev am: aa2e1787b7 -s ours" into oreo-cts-dev by Rubin Xu · 7 years ago
  97. 62d9a1d Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r30" into marshmallow-cts-dev am: e7d20373d1 -s ours" into nougat-cts-dev am: 7f248a369e -s ours" into nougat-mr1-cts-dev am: 8430e6b300 -s ours" into oreo-cts-dev am: 5bd9c057e4 -s ours" into oc-dev by Android Build Merger (Role) · 7 years ago
  98. 824b23d Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r30" into marshmallow-cts-dev am: e7d20373d1 -s ours" into nougat-cts-dev am: 7f248a369e -s ours" into nougat-mr1-cts-dev am: 8430e6b300 -s ours" into oreo-cts-dev by agowdra · 7 years ago
  99. 80ae0a0 Merge changes from topic "am-f67bdbb4-2bbf-411e-a6ec-64000104a2a6" into oc-dev by Android Build Merger (Role) · 7 years ago
  100. 31f9354 Merge "Merge "Merge "resolve merge conflicts of ed60e055bd5ec64e8c74b79d8f23da259634e0c4 to nougat-cts-dev" into nougat-cts-dev am: dc2b4d9acf" into nougat-mr1-cts-dev am: 10b49e953b" into oreo-cts-dev by Nick Chalko · 7 years ago