Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / d75d4a384c8f89167813814993e441f0ed3e2836
commitd75d4a384c8f89167813814993e441f0ed3e2836[log] [tgz]
authorJulia Tuttle <juliatuttle@google.com>Mon Apr 15 20:33:20 2024 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Mon Apr 15 20:33:20 2024 +0000
tree20b4468e82e642b85cd60d3469e632c8d2569e94
parentcd48f77bc0e9ecbe95c7b261a59c059ee68cd817 [diff]
parentdc3315441d020fb20bdaf825c158c502f633952c [diff]
[automerger skipped] Merge changes from topic "cherrypicker-L63500030002772203:N60600030045907686" into 24D1-dev am: dc3315441d -s ours

am skip reason: Merged-In I2160dd17d39bd00a045422e2096d14b9ebb68902 with SHA-1 7f5aea44a9 is already in history

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

Change-Id: I1f4797cd7eb1561bdb2fff6c2451f0ecf8bc479d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 20b4468e82e642b85cd60d3469e632c8d2569e94
  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. 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