Google Git
Sign in
android / platform / packages / apps / Camera2 / 3e1613cef9de071f9d8eae07e7290d827580d889
commit3e1613cef9de071f9d8eae07e7290d827580d889[log] [tgz]
authorXin Li <delphij@google.com>Fri Sep 11 02:02:21 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Sep 11 02:02:21 2020 +0000
tree8a3950f03b69884eda5ad8cb1597530f02fb02ac
parent574c98c925f276a3879ea6743fc236ffebba91a1 [diff]
parent369626617940116bf7c57f97ca8ca651d138053d [diff]
[automerger skipped] Merge "Merge Android R" am: 54558abf56 -s ours am: 3696266179 -s ours

am skip reason: Change-Id I2ed2c7209e2e6ce7364a8a6450c953a3920d8acb with SHA-1 94601bb987 is in history

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

Change-Id: I50c82c0cfa10bc6e35aa5b54852a9ad982627966
tree: 8a3950f03b69884eda5ad8cb1597530f02fb02ac
  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