tree caa3460fd4acb36ddfb30a917a8ba8ccd465a3c8
parent e5f8832661e8e064ba66d0bf13b0a6e1104903ce
parent dc926ca268b901fdc418304bb20eda52e1fbbf48
author Xin Li <delphij@google.com> 1602210908 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602210908 +0000

[automerger skipped] Skip ab/6749736 in stage. am: 4a29100264 -s ours am: dc926ca268 -s ours

am skip reason: Change-Id I1ed1643a16204a677aadef2d13998b43c4eb87fe with SHA-1 532c33f3c8 is in history

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

Change-Id: I2c989955d697fbc0bd2931653e22d814a920c22f