Google Git
Sign in
android / platform / frameworks / base / 65467677e234f603fbabf7d62ce0d4f01e373955
commit65467677e234f603fbabf7d62ce0d4f01e373955[log] [tgz]
authorAutomerger Merge Worker <[email protected]>Tue Jan 14 16:10:05 2025 -0800
committerGerrit Code Review <[email protected]>Tue Jan 14 16:10:05 2025 -0800
tree6e4cd692c69d42e7302b2bbed2812a73ca7690b6
parent697c98e32d348ae9fafcf45c78e130c27be9cf36 [diff]
parent62ed4a0762a02178f3e7a403f6c7bf84bca69e03 [diff]
Merge changes from topic "am-50470ae8787c49ac95cec11e53c74bb2" into main

* changes:
  [automerger skipped] Merge "Re-enable NetworkTimeUpdateService for Wear" into android15-tests-dev am: f52c4570bf -s ours
  [automerger skipped] Re-enable NetworkTimeUpdateService for Wear am: 9056d9859e -s ours
tree: 6e4cd692c69d42e7302b2bbed2812a73ca7690b6
  1. .prebuilt_info/
  2. android-sdk-flags/
  3. apct-tests/
  4. apex/
  5. api/
  6. boot/
  7. cmds/
  8. config/
  9. core/
  10. data/
  11. docs/
  12. drm/
  13. errorprone/
  14. graphics/
  15. identity/
  16. keystore/
  17. libs/
  18. location/
  19. media/
  20. mime/
  21. mms/
  22. native/
  23. nfc-extras/
  24. nfc-non-updatable/
  25. obex/
  26. omapi/
  27. opengl/
  28. packages/
  29. proto/
  30. ravenwood/
  31. rs/
  32. samples/
  33. sax/
  34. services/
  35. startop/
  36. telecomm/
  37. telephony/
  38. test-base/
  39. test-junit/
  40. test-legacy/
  41. test-mock/
  42. test-runner/
  43. tests/
  44. tools/
  45. wifi/
  46. .clang-format
  47. .gitignore
  48. .mailmap
  49. AconfigFlags.bp
  50. ACTIVITY_MANAGER_OWNERS
  51. ACTIVITY_SECURITY_OWNERS
  52. ADPF_OWNERS
  53. Android.bp
  54. BAL_OWNERS
  55. BATTERY_STATS_OWNERS
  56. BROADCASTS_OWNERS
  57. CleanSpec.mk
  58. FF_LEADS_OWNERS
  59. framework-jarjar-rules.txt
  60. GAME_MANAGER_OWNERS
  61. INPUT_OWNERS
  62. INTENT_OWNERS
  63. lint-baseline.xml
  64. LSE_APP_COMPAT_OWNERS
  65. MEMORY_OWNERS
  66. METADATA
  67. MODULE_LICENSE_APACHE2
  68. MULTIUSER_OWNERS
  69. NOTICE
  70. OOM_ADJUSTER_OWNERS
  71. OWNERS
  72. OWNERS.md
  73. PACKAGE_MANAGER_OWNERS
  74. pathmap.mk
  75. PERFORMANCE_OWNERS
  76. PREUPLOAD.cfg
  77. PREUPLOAD_OWNERS
  78. ProtoLibraries.bp
  79. Ravenwood.bp
  80. SDK_OWNERS
  81. SECURITY_STATE_OWNERS
  82. SQLITE_OWNERS
  83. TEST_MAPPING
  84. TestProtoLibraries.bp
  85. THERMAL_OWNERS
  86. TRACE_OWNERS
  87. WEAR_OWNERS
  88. ZYGOTE_OWNERS