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

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

Change-Id: I0131132b59eb621fc272d31c51b1fc6ab9d91a2a
---

3b441660e80d40618f7d9bdd436058829d4fda34