Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / cts / 46cb38da6db0a6f44abacc353eedec41d7a8074c
  1. 46cb38d Merge "CtsMediaBitstreamsTestCases: add bitstreams to DynamicConfig" into oc-dev am: a94f43d7de am: 6c16a22a1c by Robert Shih · 7 years ago
  2. 4756ddd Merge "CtsMediaBitstreamsTestCases: add bitstreams to DynamicConfig" into oc-dev am: a94f43d7de by Robert Shih · 7 years ago
  3. 6c16a22 Merge "CtsMediaBitstreamsTestCases: add bitstreams to DynamicConfig" into oc-dev by Robert Shih · 7 years ago
  4. a94f43d Merge "CtsMediaBitstreamsTestCases: add bitstreams to DynamicConfig" into oc-dev by Robert Shih · 7 years ago
  5. 4fabe9d Merge "WebView: add CTS test for WebView#getSafeBrowsingPrivacyPolicyUrl" into oc-mr1-dev by Nate Fischer · 7 years ago
  6. 7bbc882 Merge "WebView: add CTS test for WebView#getSafeBrowsingPrivacyPolicyUrl" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  7. 9399cc9 Merge "Merge "Test: check codec support before running video related test" into oc-dev am: 8177dcbfdd am: 2a966e4aa9 am: 04a282d6de" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  8. 4569cba Merge "Test: check codec support before running video related test" into oc-dev am: 8177dcbfdd am: 2a966e4aa9 by Zhenqiang Li · 7 years ago
  9. 55406a3 Merge "Merge "Prevent enabling/disabling bluetooth when it is not supported." into oc-dev am: bf244be15d am: 4cb640dd0f am: 9d51c227ba" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  10. c87bfba Merge "Prevent enabling/disabling bluetooth when it is not supported." into oc-dev am: bf244be15d am: 4cb640dd0f by Erwin Jansen · 7 years ago
  11. f14f16a Merge "Merge "Allow clearing instant app meta-data - CTS" into oc-mr1-dev am: 515f731829" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  12. 016ebd0 Merge "Allow clearing instant app meta-data - CTS" into oc-mr1-dev by Svet Ganov · 7 years ago
  13. f97bc61 Merge "Merge "Test: check codec support before running video related test" into oc-dev am: 8177dcbfdd am: 2a966e4aa9" into oc-dr1-dev-plus-aosp by Zhenqiang Li · 7 years ago
  14. 5482755 Merge "Merge "Test: check codec support before running video related test" into oc-dev am: 8177dcbfdd am: 4dfe00776a" into oc-dr1-dev-plus-aosp by Zhenqiang Li · 7 years ago
  15. a8814ef Merge "Merge "Prevent enabling/disabling bluetooth when it is not supported." into oc-dev am: bf244be15d am: 4cb640dd0f" into oc-dr1-dev-plus-aosp by Erwin Jansen · 7 years ago
  16. 405a39d Merge "Prevent enabling/disabling bluetooth when it is not supported." into oc-dev am: bf244be15d am: 206bdda623 by Erwin Jansen · 7 years ago
  17. 00c0ae3 Merge "Merge "Test: check codec support before running video related test" into oc-dev am: 8177dcbfdd am: 2a966e4aa9" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  18. 8de3ff6 Merge "Merge "Test: check codec support before running video related test" into oc-dev am: 8177dcbfdd am: 4dfe00776a" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  19. 91a7fb3 Merge "Test: check codec support before running video related test" into oc-dev am: 8177dcbfdd by Zhenqiang Li · 7 years ago
  20. 04a282d Merge "Test: check codec support before running video related test" into oc-dev am: 8177dcbfdd by Zhenqiang Li · 7 years ago
  21. 057b8ce Merge "Test: check codec support before running video related test" into oc-dev am: 8177dcbfdd by Zhenqiang Li · 7 years ago
  22. 2fb7298 Merge "Merge "Prevent enabling/disabling bluetooth when it is not supported." into oc-dev am: bf244be15d am: 4cb640dd0f" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  23. 9d51c22 Merge "Prevent enabling/disabling bluetooth when it is not supported." into oc-dev am: bf244be15d by Erwin Jansen · 7 years ago
  24. a100344 Merge "Prevent enabling/disabling bluetooth when it is not supported." into oc-dev am: bf244be15d by Erwin Jansen · 7 years ago
  25. 09b33e1 Merge "Prevent enabling/disabling bluetooth when it is not supported." into oc-dev am: bf244be15d by Erwin Jansen · 7 years ago
  26. 2a966e4 Merge "Test: check codec support before running video related test" into oc-dev by Zhenqiang Li · 7 years ago
  27. 4dfe007 Merge "Test: check codec support before running video related test" into oc-dev by Zhenqiang Li · 7 years ago
  28. 4cb640d Merge "Prevent enabling/disabling bluetooth when it is not supported." into oc-dev by Erwin Jansen · 7 years ago
  29. 206bdda Merge "Prevent enabling/disabling bluetooth when it is not supported." into oc-dev by Erwin Jansen · 7 years ago
  30. 867a443 Merge "WebView: rename API in tests, remove obsolete tests" into oc-mr1-dev by Nate Fischer · 7 years ago
  31. 515f731 Merge "Allow clearing instant app meta-data - CTS" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  32. 5e5c9c2 Merge "WebView: rename API in tests, remove obsolete tests" into oc-mr1-dev by Nate Fischer · 7 years ago
  33. 8177dcb Merge "Test: check codec support before running video related test" into oc-dev by TreeHugger Robot · 7 years ago
  34. bf244be Merge "Prevent enabling/disabling bluetooth when it is not supported." into oc-dev by TreeHugger Robot · 7 years ago
  35. 033d5e8 Merge "Merge "CTS: Fixed NotificationTest for watches, since they always suppress notifications" into oc-dev am: ea85abbfc3 am: 8c899901f5 am: a80d54d1d4" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  36. 7d745d7 Merge "CTS: Fixed NotificationTest for watches, since they always suppress notifications" into oc-dev am: ea85abbfc3 am: 8c899901f5 by Keith Craigie · 7 years ago
  37. f770229 Merge "Merge "CTS: Fixed NotificationTest for watches, since they always suppress notifications" into oc-dev am: ea85abbfc3 am: 7befd6b4c9" into oc-dr1-dev-plus-aosp by Keith Craigie · 7 years ago
  38. c4feaac Merge "CTS: Fixed NotificationTest for watches, since they always suppress notifications" into oc-dev am: ea85abbfc3 am: 8c899901f5 by Keith Craigie · 7 years ago
  39. cac5468 Merge "Merge "CTS: Fixed NotificationTest for watches, since they always suppress notifications" into oc-dev am: ea85abbfc3 am: 7befd6b4c9" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  40. a80d54d Merge "CTS: Fixed NotificationTest for watches, since they always suppress notifications" into oc-dev am: ea85abbfc3 by Keith Craigie · 7 years ago
  41. 4324f4a Merge "CTS: Fixed NotificationTest for watches, since they always suppress notifications" into oc-dev am: ea85abbfc3 by Keith Craigie · 7 years ago
  42. aeb287a Merge "CTS: Fixed NotificationTest for watches, since they always suppress notifications" into oc-dev am: ea85abbfc3 by Keith Craigie · 7 years ago
  43. 8c89990 Merge "CTS: Fixed NotificationTest for watches, since they always suppress notifications" into oc-dev by Keith Craigie · 7 years ago
  44. 7befd6b Merge "CTS: Fixed NotificationTest for watches, since they always suppress notifications" into oc-dev by Keith Craigie · 7 years ago
  45. ea85abb Merge "CTS: Fixed NotificationTest for watches, since they always suppress notifications" into oc-dev by Keith Craigie · 7 years ago
  46. 658d3f1 Merge "Tag small instrumentation module as not-shardable" into oc-mr1-dev by jdesprez · 7 years ago
  47. 8a83788 Merge "MediaPlayer/Modular DRM/CTS for AOSP: Using new ClearKey content with proper PSSH" into oc-mr1-dev by Hassan Shojania · 7 years ago
  48. 76ff21a Merge "Tag small instrumentation module as not-shardable" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  49. 83e3d03 Merge "MediaPlayer/Modular DRM/CTS for AOSP: Using new ClearKey content with proper PSSH" into oc-mr1-dev by Hassan Shojania · 7 years ago
  50. 6990157 Test: check codec support before running video related test by Zhenqiang Li · 7 years ago
  51. 2e9b531 Merge "Revert "CtsMediaBitstreamsTestCases: bitstreams package via annotation"" into oc-dev am: d7317b21af am: 725425c0bf by Robert Shih · 7 years ago
  52. 3a9181b Merge "Revert "CtsMediaBitstreamsTestCases: bitstreams package via annotation"" into oc-dev am: d7317b21af am: 6c7df20e2e by Robert Shih · 7 years ago
  53. 5dd4d7f Merge "Revert "CtsMediaBitstreamsTestCases: bitstreams package via annotation"" into oc-dev am: d7317b21af by Robert Shih · 7 years ago
  54. e7a1626 Merge "Revert "CtsMediaBitstreamsTestCases: bitstreams package via annotation"" into oc-dev am: d7317b21af am: 6c7df20e2e by Robert Shih · 7 years ago
  55. 4d38f3b Merge "Revert "CtsMediaBitstreamsTestCases: bitstreams package via annotation"" into oc-dev am: d7317b21af by Robert Shih · 7 years ago
  56. 018b7ee Merge "Revert "CtsMediaBitstreamsTestCases: bitstreams package via annotation"" into oc-dev am: d7317b21af by Robert Shih · 7 years ago
  57. 725425c Merge "Revert "CtsMediaBitstreamsTestCases: bitstreams package via annotation"" into oc-dev by Robert Shih · 7 years ago
  58. 6c7df20 Merge "Revert "CtsMediaBitstreamsTestCases: bitstreams package via annotation"" into oc-dev by Robert Shih · 7 years ago
  59. d7317b2 Merge "Revert "CtsMediaBitstreamsTestCases: bitstreams package via annotation"" into oc-dev by Robert Shih · 7 years ago
  60. 165b5f2 WebView: rename API in tests, remove obsolete tests by Nate Fischer · 7 years ago
  61. 1ae3a08 MediaPlayer/Modular DRM/CTS for AOSP: Using new ClearKey content with proper PSSH by Hassan Shojania · 7 years ago
  62. 58862d6 Merge "Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 am: 18d681b849 -s ours am: cac9b8b5e1 am: 10c8a4f14a" into oc-dr1-dev-plus-aosp am: 210bfcbf81" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  63. eeef48f Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 am: 18d681b849 -s ours am: cac9b8b5e1 am: 10c8a4f14a" into oc-dr1-dev-plus-aosp by Aaron Holden · 7 years ago
  64. 34faffe Merge "Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 am: 18d681b849 -s ours am: cac9b8b5e1 am: 446f5891fd" into oc-dr1-dev-plus-aosp am: 45b36d4193" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  65. 49d8528 Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 am: 18d681b849 -s ours am: cac9b8b5e1 am: 446f5891fd" into oc-dr1-dev-plus-aosp by Aaron Holden · 7 years ago
  66. 4abd535 Merge "Merge "Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours am: 627203c423 am: 0b6dbcf466 am: 934f1038a7 -s ours am: 3ee914fe08 am: 1f49f9cb91" into oc-dr1-dev-plus-aosp am: 083a64872e" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  67. 8a6dd8c Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 am: 18d681b849 -s ours am: cac9b8b5e1 am: 10c8a4f14a am: e1e98300d5" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  68. e671b19 Merge "Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours am: 627203c423 am: 0b6dbcf466 am: 934f1038a7 -s ours am: 3ee914fe08 am: 1f49f9cb91" into oc-dr1-dev-plus-aosp by Aaron Holden · 7 years ago
  69. 9bfbd0e Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 am: 18d681b849 -s ours am: cac9b8b5e1 am: 10c8a4f14a by Aaron Holden · 7 years ago
  70. 54e84fb Merge "Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours am: 627203c423 am: 0b6dbcf466 am: 934f1038a7 -s ours am: 3ee914fe08 am: 96a409a93e am: 5cb29f7674" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  71. 4c22255 Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours am: 627203c423 am: 0b6dbcf466 am: 934f1038a7 -s ours am: 3ee914fe08 am: 96a409a93e by Aaron Holden · 7 years ago
  72. 3e15300 Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours am: 627203c423 am: 0b6dbcf466 am: 934f1038a7 -s ours am: 3ee914fe08 am: 1f49f9cb91 by Aaron Holden · 7 years ago
  73. 210bfcb Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 am: 18d681b849 -s ours am: cac9b8b5e1 am: 10c8a4f14a" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  74. 45b36d4 Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 am: 18d681b849 -s ours am: cac9b8b5e1 am: 446f5891fd" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  75. e00b3dd Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 am: 18d681b849 -s ours am: cac9b8b5e1 by Aaron Holden · 7 years ago
  76. e1e9830 Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 am: 18d681b849 -s ours am: cac9b8b5e1 by Aaron Holden · 7 years ago
  77. f359fa3 Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 am: 18d681b849 -s ours am: cac9b8b5e1 by Aaron Holden · 7 years ago
  78. 083a648 Merge "Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours am: 627203c423 am: 0b6dbcf466 am: 934f1038a7 -s ours am: 3ee914fe08 am: 1f49f9cb91" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  79. d6a2294 Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours am: 627203c423 am: 0b6dbcf466 am: 934f1038a7 -s ours am: 3ee914fe08 by Aaron Holden · 7 years ago
  80. 5cb29f7 Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours am: 627203c423 am: 0b6dbcf466 am: 934f1038a7 -s ours am: 3ee914fe08 by Aaron Holden · 7 years ago
  81. 86cc905 Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours am: 627203c423 am: 0b6dbcf466 am: 934f1038a7 -s ours am: 3ee914fe08 by Aaron Holden · 7 years ago
  82. 10c8a4f Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 am: 18d681b849 -s ours by Aaron Holden · 7 years ago
  83. 4ca289e Merge "Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours" am: 8dc2ef324a -s ours am: ef3bc77cd5 -s ours am: 6aee3a1a71 by Aaron Holden · 7 years ago
  84. 446f589 Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 am: 18d681b849 -s ours by Aaron Holden · 7 years ago
  85. 96a409a Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours am: 627203c423 am: 0b6dbcf466 am: 934f1038a7 -s ours by Aaron Holden · 7 years ago
  86. 1f49f9c Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours am: 627203c423 am: 0b6dbcf466 am: 934f1038a7 -s ours by Aaron Holden · 7 years ago
  87. 3ddad77 Revert "CtsMediaBitstreamsTestCases: bitstreams package via annotation" by Robert Shih · 7 years ago
  88. cac9b8b Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 by Aaron Holden · 7 years ago
  89. 3ec77ce Merge "Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours" am: 8dc2ef324a -s ours am: ef3bc77cd5 -s ours by Aaron Holden · 7 years ago
  90. 3ee914f Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours am: 627203c423 am: 0b6dbcf466 by Aaron Holden · 7 years ago
  91. 18d681b Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e by Aaron Holden · 7 years ago
  92. 934f103 Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours am: 627203c423 by Aaron Holden · 7 years ago
  93. b14a46e Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 am: 2878aa6e0e by Aaron Holden · 7 years ago
  94. 93589ab Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours am: 2a51f55764 by Aaron Holden · 7 years ago
  95. 6aee3a1 Merge "Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours" am: 8dc2ef324a -s ours by Aaron Holden · 7 years ago
  96. 0b6dbcf Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours by Aaron Holden · 7 years ago
  97. 2878aa6 Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours by Aaron Holden · 7 years ago
  98. 627203c Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev by Aaron Holden · 7 years ago
  99. ef3bc77 Merge "Merge "Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6 -s ours" into nougat-mr1-cts-dev am: 7db0724167 -s ours" by Aaron Holden · 7 years ago
  100. 2a51f55 Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev by Aaron Holden · 7 years ago