Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / packages / apps / Camera2 / 47cc4429c37d88db798c51e1b4078cc8cb04a75e
commit47cc4429c37d88db798c51e1b4078cc8cb04a75e[log] [tgz]
authorXin Li <delphij@google.com>Wed Aug 18 00:23:30 2021 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Aug 18 00:23:30 2021 +0000
treedf740f361d6506b69c1097a67d8c0c573ccb8df2
parent10020c9a1e57ed9d716e8a0bf2766a3226424e07 [diff]
parent323552d0ac061714cf12140a359023d087ae3094 [diff]
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: efe4290d06 -s ours am: 7259f97886 -s ours am: 4fbedd4283 -s ours am: 323552d0ac -s ours

am skip reason: Merged-In I119bb89b2b003177b217fc04e1a57d540603dcaa with SHA-1 5d01e7ec33 is already in history

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

Change-Id: I522bef1ceae8e79ed90ce6659a5edd86b748e198
tree: df740f361d6506b69c1097a67d8c0c573ccb8df2
  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