Google Git
Sign in
android / platform / superproject / main / 5df0ce74a6027b93e43e20bcb0f3111cb4815e14
commit5df0ce74a6027b93e43e20bcb0f3111cb4815e14[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri May 17 20:53:32 2024 +0000
committermdb:android-git <superproject-auto-update@invalid>Fri May 17 20:53:34 2024 +0000
tree989b9deaaff95cb87b47f5894f9778e5ddb39abc
parente63d38927da2fc501e5041ca1cf149c1002b88f0 [diff]
Merge changes from topic "am-390ed57412774153b264a2656c061f47" into main

* changes:
  [automerger skipped] Merge changes from topic "cherrypicker-L97700030003622837:N07800030057406848" into android14-tests-dev am: ab80b933f5 -s ours
  [automerger skipped] RESTRICT AUTOMERGE am: 2dfde193e3 -s ours
1 file changed
tree: 989b9deaaff95cb87b47f5894f9778e5ddb39abc
  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