Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 3c75651df56a8e402a04066ae3ff02a9252bfc26
commit3c75651df56a8e402a04066ae3ff02a9252bfc26[log] [tgz]
authorCarlos Galo <carlosgalo@google.com>Tue Feb 06 23:35:44 2024 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Tue Feb 06 23:35:44 2024 +0000
tree1404dcb73e7091219ac30afe093f4ecb03f639f9
parent1778bd9e2c74b5edec7db6a5b074a2b11990e62c [diff]
parentcde990a358fff362cc3f6a3965a51e839dab5d60 [diff]
[automerger skipped] Merge changes from topic "oom-ams-subreason" into main am: 8b901f01e0 -s ours am: cde990a358 -s ours

am skip reason: Merged-In I8827995a54e2fb3da3b5c5bd6b9401ef8a5508be with SHA-1 13a32968c6 is already in history

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

Change-Id: I12c17e913f01d5335fe5c2463f96d0dfe9d817a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 1404dcb73e7091219ac30afe093f4ecb03f639f9
  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. MEMORY_OWNERS
  62. METADATA
  63. MODULE_LICENSE_APACHE2
  64. MULTIUSER_OWNERS
  65. NOTICE
  66. OWNERS
  67. OWNERS.md
  68. PACKAGE_MANAGER_OWNERS
  69. pathmap.mk
  70. PERFORMANCE_OWNERS
  71. PREUPLOAD.cfg
  72. ProtoLibraries.bp
  73. Ravenwood.bp
  74. SECURITY_STATE_OWNERS
  75. SQLITE_OWNERS
  76. TEST_MAPPING
  77. TestProtoLibraries.bp
  78. THERMAL_OWNERS
  79. TRACE_OWNERS
  80. WEAR_OWNERS
  81. ZYGOTE_OWNERS