From: The Android Automerger <android-build@android.com>
Date: Tue, 20 Nov 2012 00:13:13 +0000 (-0800)
Subject: merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
X-Git-Tag: android-x86-4.4-r1~422^2~15^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=87fe15c4fc233da26af7f9136e7cddc3d5c7711a;p=android-x86%2Fframeworks-native.git

merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
---

87fe15c4fc233da26af7f9136e7cddc3d5c7711a