From: Bill Yi <byi@google.com>
Date: Fri, 19 Oct 2018 21:56:47 +0000 (-0700)
Subject: Merge pi-dr1-dev to aosp-master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d0a34383661c2e18d9569c38b330d9e786bbae46;p=android-x86%2Fpackages-apps-Camera2.git

Merge pi-dr1-dev to aosp-master
am: 8891a0c1cd

Change-Id: I5f04ae2bdcc90d08541a589fe488c471756ff7ae
---

d0a34383661c2e18d9569c38b330d9e786bbae46