Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / a3234930380c748d5ff800c08d4d3fd643241aea
commita3234930380c748d5ff800c08d4d3fd643241aea[log] [tgz]
authorXin Li <delphij@google.com>Thu Mar 07 10:55:41 2024 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Mar 07 10:55:41 2024 +0000
treef51ffdced29c1abfd87b08e1459246a1f3e37278
parented85cfa4c35b14048e9a14d1e0553c6711b4bfa2 [diff]
parentbf13cbbd7bb1171b1230759972ca4b6ea139d175 [diff]
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: bf13cbbd7b -s ours

am skip reason: Merged-In I50d1c3ff964b0863d53016c33b2ed4dec9f34f7d with SHA-1 ed85cfa4c3 is already in history

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

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