From: Yin-Chia Yeh <yinchiayeh@google.com>
Date: Wed, 2 Aug 2017 05:22:03 +0000 (+0000)
Subject: Merge "Merge "Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7... 
X-Git-Tag: android-x86-9.0-r1~46^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3cff4379bb59838bbe86713826c2b207dcf01783;p=android-x86%2Fpackages-apps-Camera2.git

Merge "Merge "Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7c" into oc-dr1-dev-plus-aosp am: e3899fe278" into oc-mr1-dev-plus-aosp
am: 3af29cdb7b

Change-Id: If74a22df175b79ccc0c56363862c5cf5297c0900
---

3cff4379bb59838bbe86713826c2b207dcf01783