From: Bill Yi <byi@google.com>
Date: Wed, 24 Oct 2018 17:12:41 +0000 (-0700)
Subject: [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=980169741a88265f6ec3cdb4175e49a7824b4a7d;hp=980169741a88265f6ec3cdb4175e49a7824b4a7d;p=android-x86%2Fpackages-apps-Gallery2.git

[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 346d27382b  -s ours
am: 11bf4ed50b  -s ours

Change-Id: I52c7c0c370c9173397e48f5cfca7557d3b80cb43
---