From: Xin Li <delphij@google.com>
Date: Thu, 7 Dec 2017 21:34:34 +0000 (+0000)
Subject: DO NOT MERGE: Merge Oreo MR1 into master am: 4e0c4861f9  -s ours am: 3b441660e8
X-Git-Tag: android-x86-9.0-r1~13^2~1
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Gallery2.git;a=commitdiff_plain;h=a156bac831da5f8e2390e42c0350c5251af46528

DO NOT MERGE: Merge Oreo MR1 into master am: 4e0c4861f9  -s ours am: 3b441660e8
am: ea0cde1302  -s ours

Change-Id: I2f6f5a1a9bd7d7cfec92539c7a8cc2f9b5185683
---

a156bac831da5f8e2390e42c0350c5251af46528