From: Xin Li <delphij@google.com>
Date: Wed, 6 Dec 2017 19:52:08 +0000 (-0800)
Subject: DO NOT MERGE: Merge Oreo MR1 into master
X-Git-Tag: android-x86-9.0-r1~5^2^2~1^2~4^2
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Gallery2.git;a=commitdiff_plain;h=4e0c4861f9f0d2e3d6f69b520d132c22008b48dd

DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I02acbb1837baccf6537a0e2d7cafcfdf053ef3ca
---

4e0c4861f9f0d2e3d6f69b520d132c22008b48dd