Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 3b20234f6b8abf59f0b08dd1bc4c235be4da117e
commit3b20234f6b8abf59f0b08dd1bc4c235be4da117e[log] [tgz]
authorLouis Chang <louischang@google.com>Wed Mar 20 00:16:52 2024 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Mar 20 00:16:52 2024 +0000
tree6c26aff0352af86708b9d08ba40d1d55dfa7bde1
parentc054f0b22c44997a94d2c5fcf77d70e6c08777e7 [diff]
parent99db69acd9292d08878389b8db703c9c1e53bf5d [diff]
[automerger skipped] Merge "Fix MixedDeviceOwnerTest test failure" into 24D1-dev am: 99db69acd9 -s ours

am skip reason: Merged-In Iba8a2004a58a4d440a0c62c59ae89b5e4ca1253c with SHA-1 5f1e492e15 is already in history

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

Change-Id: Idefaa3b1dd7314b0c44b425982f956ea3c2f513e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 6c26aff0352af86708b9d08ba40d1d55dfa7bde1
  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. Android.mk
  52. BAL_OWNERS
  53. BATTERY_STATS_OWNERS
  54. BROADCASTS_OWNERS
  55. CleanSpec.mk
  56. framework-jarjar-rules.txt
  57. GAME_MANAGER_OWNERS
  58. INPUT_OWNERS
  59. INTENT_OWNERS
  60. ktfmt_includes.txt
  61. lint-baseline.xml
  62. LSE_APP_COMPAT_OWNERS
  63. MEMORY_OWNERS
  64. METADATA
  65. MODULE_LICENSE_APACHE2
  66. MULTIUSER_OWNERS
  67. NOTICE
  68. OWNERS
  69. OWNERS.md
  70. PACKAGE_MANAGER_OWNERS
  71. pathmap.mk
  72. PERFORMANCE_OWNERS
  73. PREUPLOAD.cfg
  74. ProtoLibraries.bp
  75. Ravenwood.bp
  76. SECURITY_STATE_OWNERS
  77. SQLITE_OWNERS
  78. TEST_MAPPING
  79. TestProtoLibraries.bp
  80. THERMAL_OWNERS
  81. TRACE_OWNERS
  82. WEAR_OWNERS
  83. ZYGOTE_OWNERS