resolve Coastguard cherrypick merge conflict for change: 1656007

Change-Id: Ia4653db6a34fc6bee9b7af5e03ea7a7e2b509e6d
(cherry picked from commit 0102b2548cf2b00f8a02617a3f35e2c00e69a05f)
1 file changed
tree: 0b12503abf12ec98c086ce857e8a98a62ee07bf4
  1. ./
  2. .idea/
  3. activity/
  4. ads/
  5. androidx-plugin/
  6. annotation/
  7. appcompat/
  8. appsearch/
  9. arch/
  10. asynclayoutinflater/
  11. autofill/
  12. benchmark/
  13. biometric/
  14. browser/
  15. buildSrc/
  16. buildSrc-tests/
  17. busytown/
  18. camera/
  19. cardview/
  20. collection/
  21. compose/
  22. concurrent/
  23. contentaccess/
  24. contentpager/
  25. coordinatorlayout/
  26. core/
  27. cursoradapter/
  28. customview/
  29. datastore/
  30. development/
  31. docs-fake/
  32. docs-runner/
  33. documentfile/
  34. drawerlayout/
  35. dumb-tests/
  36. dynamic-animation/
  37. emoji/
  38. enterprise/
  39. exifinterface/
  40. fakeannotations/
  41. fragment/
  42. frameworks/
  43. gradle/
  44. gridlayout/
  45. heifwriter/
  46. hilt/
  47. inspection/
  48. interpolator/
  49. ipc/
  50. jetifier/
  51. leanback/
  52. leanback-preference/
  53. legacy/
  54. lifecycle/
  55. lint-checks/
  56. lint-demos/
  57. loader/
  58. localbroadcastmanager/
  59. media/
  60. media2/
  61. mediarouter/
  62. mppsample/
  63. navigation/
  64. paging/
  65. palette/
  66. percentlayout/
  67. playground/
  68. preference/
  69. print/
  70. recommendation/
  71. recyclerview/
  72. remotecallback/
  73. room/
  74. samples/
  75. savedstate/
  76. security/
  77. serialization/
  78. sharetarget/
  79. slices/
  80. slidingpanelayout/
  81. sqlite/
  82. startup/
  83. swiperefreshlayout/
  84. test/
  85. testutils/
  86. textclassifier/
  87. tracing/
  88. transition/
  89. tv-provider/
  90. ui/
  91. vectordrawable/
  92. versionedparcelable/
  93. viewpager/
  94. viewpager2/
  95. wear/
  96. webkit/
  97. window/
  98. work/
  99. .gitignore
  100. .mailmap
  101. build.gradle
  102. cleanBuild.sh
  103. code-review.md
  104. gradle.properties
  105. gradlew
  106. include-composite-deps.gradle
  107. include-support-library.gradle
  108. LICENSE.txt
  109. OWNERS
  110. PREUPLOAD.cfg
  111. README.md
  112. settings.gradle
  113. studiow