From: Ying Wang <wangying@android.com>
Date: Wed, 16 Dec 2015 19:57:20 +0000 (+0000)
Subject: Merge "Fix ProGuard error."
X-Git-Tag: android-x86-7.1-r1~20^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a6d029fde3;hp=-c;p=android-x86%2Fpackages-apps-Gallery2.git

Merge "Fix ProGuard error."
am: 42cb024cff

* commit '42cb024cff9d5fd3231ce8c7cb3c855f34693813':
  Fix ProGuard error.
---

a6d029fde3419625f6762eb115e209f8e221b089