Google Git
Sign in
android / platform / packages / apps / Camera2 / 665260523d8f0612fd8820d561d48040f8c364e6
commit665260523d8f0612fd8820d561d48040f8c364e6[log] [tgz]
authorXin Li <delphij@google.com>Fri Oct 08 07:56:23 2021 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Oct 08 07:56:23 2021 +0000
tree2931fedfdc6caf679715521c2bbfae56c7e2ccfc
parent4fbedd42834dcec17730614bbd11fc02445ff5d2 [diff]
parent9fe0c4e6d40e2b7e2817e2e063d3cfb4ca6d6b69 [diff]
[automerger skipped] Merge "Merge Android 12" am: 5b93afd7fc -s ours am: 002b97e836 -s ours am: 9fe0c4e6d4 -s ours

am skip reason: Merged-In I950f219dbcb4e125e2eb29d5311241601a673f79 with SHA-1 efe4290d06 is already in history

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

Change-Id: I276f3a2d55527e048aa3c3cb60414a5676372010
tree: 2931fedfdc6caf679715521c2bbfae56c7e2ccfc
  1. assets/
  2. jni/
  3. res/
  4. res_p/
  5. src/
  6. src_pd/
  7. src_pd_gcam/
  8. tests/
  9. .gitignore
  10. Android.mk
  11. AndroidManifest.xml
  12. CleanSpec.mk
  13. OWNERS
  14. proguard-project.txt
  15. proguard.flags
  16. project.properties
  17. version.mk