From: Xin Li <delphij@google.com>
Date: Sat, 9 Jun 2018 09:55:07 +0000 (-0700)
Subject: Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0687b77bdb641e95955a0e40ef255763d3136391;p=android-x86%2Fpackages-apps-Camera2.git

Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: b11752bba7

Change-Id: If8d229b75b68304c5553ebe42f74996e4db6848a
---

0687b77bdb641e95955a0e40ef255763d3136391