From: The Android Automerger <android-build@google.com>
Date: Thu, 26 Sep 2013 13:01:50 +0000 (-0700)
Subject: merge in klp-release history after reset to klp-dev
X-Git-Tag: android-x86-7.1-r1~172^2~22^2^2^2^2^2^2^2^2^2^2^2^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0caef9a7d9124480cfb6d9b0d8daf1c93cda1e9c;p=android-x86%2Fpackages-apps-Gallery2.git

merge in klp-release history after reset to klp-dev
---

0caef9a7d9124480cfb6d9b0d8daf1c93cda1e9c