Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / packages / apps / Camera2 / 34332e46acaee8e4ebea41caf6bb2d9fa60a00ed
commit34332e46acaee8e4ebea41caf6bb2d9fa60a00ed[log] [tgz]
authorTreehugger Robot <treehugger-gerrit@google.com>Thu Jun 11 18:35:50 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Jun 11 18:35:50 2020 +0000
tree865b6bded5c4b45bfb769d2eeebd64e5ac8c7b1d
parent51ede0905a1c65921cf3a978ff5f57330272cd5b [diff]
parentdb256262aa007ca015a1b8274a8cc3689fd63c54 [diff]
[automerger skipped] Merge changes I089f3922,I3a52a472 am: a194bc71da am: db256262aa -s ours

am skip reason: Change-Id I089f3922ac6f9a5ccffdc672aceeed0e4a99fcb0 with SHA-1 c9e8366659 is in history

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

Change-Id: I60f1ba469bc393bf012e22c50e54a89b0b6159c0
tree: 865b6bded5c4b45bfb769d2eeebd64e5ac8c7b1d
  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