From: Ed Heyl <edheyl@google.com>
Date: Wed, 20 Feb 2013 21:47:32 +0000 (-0800)
Subject: Merge remote-tracking branch 'goog/jb-mr2-release'
X-Git-Tag: android-x86-7.1-r1~64^2~10^2~537
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=264247a7;p=android-x86%2Fpackages-apps-Gallery2.git

Merge remote-tracking branch 'goog/jb-mr2-release'
---

264247a73a61664d9b76c9eb11f305d264d8e0e2