From: The Android Automerger <android-build@google.com>
Date: Mon, 2 Sep 2013 13:01:13 +0000 (-0700)
Subject: merge in klp-release history after reset to klp-dev
X-Git-Tag: android-x86-4.4-r1~42^2~1^2^2~1^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=93854bc09110d4d3e49f20a1a8934280d5c50ee1;p=android-x86%2Fframeworks-native.git

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

93854bc09110d4d3e49f20a1a8934280d5c50ee1