tree 865b6bded5c4b45bfb769d2eeebd64e5ac8c7b1d
parent daeb87e63e7ece14c4b4b3856047e54ed9612e1a
parent f8aee8ac8e7bca7d561c45c0d876bc6a2256c726
author Treehugger Robot <treehugger-gerrit@google.com> 1592325538 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592325538 +0000

[automerger skipped] Merge "Camera2: Migrate to new storage API" am: 19ec9b5096 am: 420d74bfc8 -s ours am: f8aee8ac8e -s ours

am skip reason: Change-Id I2fd55a1b2b18b9430c6109f814422158f591bd43 with SHA-1 8969a7f327 is in history

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

Change-Id: I7f195ee820dcaacec644238bbb2caf14bbabfaff