From: The Android Open Source Project Date: Thu, 11 Oct 2012 12:57:51 +0000 (-0700) Subject: Reconcile with jb-mr1-release - do not merge X-Git-Tag: android-x86-7.1-r1~64^2~10^2~96^2~466 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=62bb3720dc21d015b634ac879b44e4c425330375;p=android-x86%2Fpackages-apps-Gallery2.git Reconcile with jb-mr1-release - do not merge Change-Id: Ib71f045b334b0f3548a6fda74f7e2ce2253d4bda --- 62bb3720dc21d015b634ac879b44e4c425330375