Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 7e817d5ea71fd058884939128cdf798d97147a0a
commit7e817d5ea71fd058884939128cdf798d97147a0a[log] [tgz]
authorTian Xie <txie@google.com>Thu Mar 14 08:21:38 2024 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Mar 14 08:21:38 2024 +0000
tree29fff20d4af8266699d3ffbfb2e854c811f164df
parentc0f3887953c2ff9312d4598ba9cc32df66185eb0 [diff]
parent4f43259fe167ee8dabc671c29e73fdad9a7d7f54 [diff]
[automerger skipped] Merge changes from topic "cherrypicker-L70300030002368648:N48600030038564399" into 24D1-dev am: 4f43259fe1 -s ours

am skip reason: Merged-In I7e329f311b3eb599195f415cf39dc28bb11139a1 with SHA-1 5fe554bfd9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26483145

Change-Id: I9555041feada6d8b8c242d37aa8192bf6ce36edb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 29fff20d4af8266699d3ffbfb2e854c811f164df
  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-legacy/
  39. test-mock/
  40. test-runner/
  41. tests/
  42. tools/
  43. wifi/
  44. .clang-format
  45. .gitignore
  46. .mailmap
  47. AconfigFlags.bp
  48. ADPF_OWNERS
  49. Android.bp
  50. Android.mk
  51. BAL_OWNERS
  52. BATTERY_STATS_OWNERS
  53. BROADCASTS_OWNERS
  54. CleanSpec.mk
  55. framework-jarjar-rules.txt
  56. GAME_MANAGER_OWNERS
  57. INPUT_OWNERS
  58. INTENT_OWNERS
  59. ktfmt_includes.txt
  60. lint-baseline.xml
  61. LSE_APP_COMPAT_OWNERS
  62. MEMORY_OWNERS
  63. METADATA
  64. MODULE_LICENSE_APACHE2
  65. MULTIUSER_OWNERS
  66. NOTICE
  67. OWNERS
  68. OWNERS.md
  69. PACKAGE_MANAGER_OWNERS
  70. pathmap.mk
  71. PERFORMANCE_OWNERS
  72. PREUPLOAD.cfg
  73. ProtoLibraries.bp
  74. Ravenwood.bp
  75. SECURITY_STATE_OWNERS
  76. SQLITE_OWNERS
  77. TEST_MAPPING
  78. TestProtoLibraries.bp
  79. THERMAL_OWNERS
  80. TRACE_OWNERS
  81. WEAR_OWNERS
  82. ZYGOTE_OWNERS