Google Git
Sign in
android / platform / superproject / main / aa3005e5544d1cc24e246e4072bb35739bbc4b02
commitaa3005e5544d1cc24e246e4072bb35739bbc4b02[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu May 02 00:00:17 2024 +0000
committermdb:android-git <superproject-auto-update@invalid>Thu May 02 00:00:18 2024 +0000
tree16040a6331574c3748a768abaca0f732c19ec7d7
parente60b5218b4fd4a78417f99521d2dba9781d9fa5a [diff]
Merge changes from topic "am-4217594278b44dfba2b52cd338542e7c" into main

* changes:
  Merge changes from topic "am-226cd33ee03740f4b75455f428276612" into android14-tests-dev am: 00e8fded79 -s ours
  [automerger skipped] Merge "add configuration for UI_MODE_TYPE_CAR for BaseTelecomTestWMockServices" into android13-tests-dev am: 36b0579da0 -s ours am: 7373de1a3d -s ours
1 file changed
tree: 16040a6331574c3748a768abaca0f732c19ec7d7
  1. bootable/
  2. build/
  3. developers/
  4. device/
  5. external/
  6. frameworks/
  7. hardware/
  8. kernel/
  9. packages/
  10. prebuilts/
  11. system/
  12. test/
  13. toolchain/
  14. tools/
  15. trusty/
  16. art
  17. bionic
  18. cts
  19. dalvik
  20. development
  21. libcore
  22. libnativehelper
  23. pdk
  24. platform_testing
  25. sdk
  26. Android.bp ⇨ build/soong/root.bp
  27. bootstrap.bash ⇨ build/soong/bootstrap.bash
  28. BUILD ⇨ build/bazel/bazel.BUILD
  29. WORKSPACE ⇨ build/bazel/bazel.WORKSPACE
  30. .gitattributes
  31. .gitmodules
  32. .supermanifest
  33. lk_inc.mk