Google Git
Sign in
android/platform/packages/apps/Camera2/d40aa75f3a04ade1c8ea7bc252dc8e68f4b9770e
commit
d40aa75f3a04ade1c8ea7bc252dc8e68f4b9770e
[log]
author
Xin Li <[email protected]>
Fri Oct 06 09:03:15 2023 +0000
committer
Automerger Merge Worker <[email protected]>
Fri Oct 06 09:03:15 2023 +0000
tree
d9fcf894623a722156bf9425ec22399dea661f53
parent
6bb39a0534ddfd4855f710d20884e568f3c6b8a8 [diff]
parent
b0d50bda8af71f0d7015b5e86f621f543994268c [diff]
[automerger skipped] Merge "Merge Android 14" into main am: 17eabae5f3 -s ours am: b0d50bda8a -s ours

am skip reason: Merged-In I7263ccf3eadc6521a30c12fe90034e5e05b8dbad with SHA-1 2478ed721d is already in history

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

Change-Id: If15feac561c061bd1736fa6bc32d7059e28a26b1
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: d9fcf894623a722156bf9425ec22399dea661f53
  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