From: Xin Li <delphij@google.com>
Date: Wed, 20 Feb 2019 18:15:13 +0000 (-0800)
Subject: [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 446d81552c... 
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Gallery2.git;a=commitdiff_plain;h=9e5d2b49ecf8ecad8576c3f32d226a3167f66211

[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 446d81552c -s ours am: e7b27a2a3d -s ours
am: cd9cb59167 -s ours
am skip reason: subject contains skip directive

Change-Id: I995962731a908b517e2a264a82cab90b72c9da47
---

9e5d2b49ecf8ecad8576c3f32d226a3167f66211