Google Git
Sign in
android/platform/packages/apps/Camera2/d8e46aeb8c7b88d64229ac90be22b3252eb4ce16
commit
d8e46aeb8c7b88d64229ac90be22b3252eb4ce16
[log]
author
Xin Li <[email protected]>
Sat Sep 07 04:03:41 2024 +0000
committer
Automerger Merge Worker <[email protected]>
Sat Sep 07 04:03:41 2024 +0000
tree
6cf78cf0056c74746cd65549bbb22e73641dc020
parent
d0a7663d9b8179d2cbe0a6e1478e9ea0166ae180 [diff]
parent
5a35a50b9d42a50350f38582b5cdcb156ef46fda [diff]
[automerger skipped] Merge 24Q3 to AOSP main am: d69994e840 -s ours am: 5a35a50b9d -s ours

am skip reason: Merged-In I5c0fb04121f17f5ad4ebb0e5129cb10ab2710608 with SHA-1 349c16128b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/3258495

Change-Id: I56362d963c14621b1620951fac5c46bb579160b5
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: 6cf78cf0056c74746cd65549bbb22e73641dc020
  1. assets/
  2. jni/
  3. res/
  4. res_p/
  5. src/
  6. src_pd/
  7. src_pd_gcam/
  8. tests/
  9. .gitignore
  10. Android.bp
  11. AndroidManifest.xml
  12. CleanSpec.mk
  13. OWNERS
  14. proguard-project.txt
  15. proguard.flags
  16. project.properties
  17. version.mk