From: Xin Li <delphij@google.com>
Date: Tue, 7 Aug 2018 21:56:57 +0000 (-0700)
Subject: Merge "Merge Android Pie into master"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9559bbb3a8;p=android-x86%2Fpackages-apps-Gallery2.git

Merge "Merge Android Pie into master"
am: 3aeae62112

Change-Id: I650c127623af5f5b4e9b19949a660b24e033fa7d
---

9559bbb3a83b551dc5e8476a1a7584966ade531c