Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 698dcbb0d76b3f93fde22fac16cae86b905667fb
commit698dcbb0d76b3f93fde22fac16cae86b905667fb[log] [tgz]
authorGirish Shetty <girishshetty@google.com>Wed Jan 17 20:14:53 2024 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Jan 17 20:14:53 2024 +0000
treed41c6cfd814d2c0a1a6f30a1027934480810e7ef
parent73f5cd2040b06950fe2803432ca9b7442031c331 [diff]
parentdc75e57bd218a51fe42db16ce918237459cad6bb [diff]
[automerger skipped] Merge "media: adding MediaFormat.KEY_IMPORTANCE" into main am: 31fd707aed am: dc75e57bd2 -s ours

am skip reason: Merged-In I750ef5a7585b7bba94f0dfb7bb8e70ec12bf70f5 with SHA-1 d3123b6bd0 is already in history

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

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