From: The Android Open Source Project Date: Fri, 7 Dec 2018 02:45:14 +0000 (-0800) Subject: [automerger skipped] Merge "DO NOT MERGE" am: 13faf565ff -s ours am: a09f89ac50... X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Gallery2.git;a=commitdiff_plain;h=4cb46b2604af2e2e7ca07c383939e13f75a21535 [automerger skipped] Merge "DO NOT MERGE" am: 13faf565ff -s ours am: a09f89ac50 -s ours am: 3ff855c94c -s ours Change-Id: Iaecee108e456a27e5e31806cf004f6bf493ba45c --- 4cb46b2604af2e2e7ca07c383939e13f75a21535