From: The Android Automerger <android-build@android.com>
Date: Tue, 11 Oct 2011 12:34:06 +0000 (-0700)
Subject: merge in ics-release history after reset to master
X-Git-Tag: android-x86-7.1-r1~2484^2^2^2^2^2^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8837d4fdac60217ebd77753d401570463620c6dd;p=android-x86%2Fpackages-apps-Gallery2.git

merge in ics-release history after reset to master
---

8837d4fdac60217ebd77753d401570463620c6dd