Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / cc980dfde61cd7efc89c42b89554d3a6ab2f7696
commitcc980dfde61cd7efc89c42b89554d3a6ab2f7696[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed May 22 18:11:35 2024 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Wed May 22 18:11:35 2024 +0000
treea8dc0f8e14ef8be9389db4bbc16089be7a9417cb
parent4f853de180b2f106852a50e89f0e6653434c3fdc [diff]
parent1c2996da38f3d96f818a92b80fc741eb8191bd3c [diff]
Merge changes from topic "am-74be07b89603414db401642981585c6a" into main

* changes:
  [automerger skipped] Merge "Restrict USB poups while setup is in progress" into sc-v2-dev am: 5428b1a143 -s ours am: 32db39c3e1 -s ours am: 6a2d0d36a1 -s ours am: 6ea510aba3 -s ours am: 6533908bf3 -s ours am: d3c7aa8e16 -s ours
  [automerger skipped] Restrict USB poups while setup is in progress am: 68363246c2 -s ours am: 4f3d2a6c59 -s ours am: 1e865c9308 -s ours am: abe6a8d90d -s ours am: e7571563ce -s ours am: 1a45a220d1 -s ours
tree: a8dc0f8e14ef8be9389db4bbc16089be7a9417cb
  1. .prebuilt_info/
  2. apct-tests/
  3. apex/
  4. api/
  5. boot/
  6. cmds/
  7. config/
  8. core/
  9. data/
  10. docs/
  11. drm/
  12. errorprone/
  13. graphics/
  14. identity/
  15. keystore/
  16. libs/
  17. location/
  18. media/
  19. mime/
  20. mms/
  21. native/
  22. nfc/
  23. nfc-extras/
  24. obex/
  25. omapi/
  26. opengl/
  27. packages/
  28. proto/
  29. ravenwood/
  30. rs/
  31. samples/
  32. sax/
  33. services/
  34. startop/
  35. telecomm/
  36. telephony/
  37. test-base/
  38. test-junit/
  39. test-legacy/
  40. test-mock/
  41. test-runner/
  42. tests/
  43. tools/
  44. wifi/
  45. .clang-format
  46. .gitignore
  47. .mailmap
  48. AconfigFlags.bp
  49. ADPF_OWNERS
  50. Android.bp
  51. BAL_OWNERS
  52. BATTERY_STATS_OWNERS
  53. BROADCASTS_OWNERS
  54. CleanSpec.mk
  55. DREAM_MANAGER_OWNERS
  56. framework-jarjar-rules.txt
  57. GAME_MANAGER_OWNERS
  58. INPUT_OWNERS
  59. INTENT_OWNERS
  60. ktfmt_includes.txt
  61. lint-baseline.xml
  62. LSE_APP_COMPAT_OWNERS
  63. MEMORY_OWNERS
  64. METADATA
  65. MODULE_LICENSE_APACHE2
  66. MULTIUSER_OWNERS
  67. NOTICE
  68. OWNERS
  69. OWNERS.md
  70. PACKAGE_MANAGER_OWNERS
  71. pathmap.mk
  72. PERFORMANCE_OWNERS
  73. PREUPLOAD.cfg
  74. ProtoLibraries.bp
  75. Ravenwood.bp
  76. SECURITY_STATE_OWNERS
  77. SQLITE_OWNERS
  78. TEST_MAPPING
  79. TestProtoLibraries.bp
  80. THERMAL_OWNERS
  81. TRACE_OWNERS
  82. WEAR_OWNERS
  83. ZYGOTE_OWNERS