From: The Android Automerger <android-build@google.com>
Date: Mon, 13 Oct 2014 13:11:18 +0000 (-0700)
Subject: merge in lmp-mr1-release history after reset to 2e5f8eaa7dbb43e5a46eda7a3d1d895f7584a122
X-Git-Tag: android-x86-6.0-r1~270^2~23^2~1^2~1^2^2~1^2^2^2^2^2^2^2^2^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=4b482de11537b4821e122eb20716fcec379f866b;p=android-x86%2Fframeworks-native.git

merge in lmp-mr1-release history after reset to 2e5f8eaa7dbb43e5a46eda7a3d1d895f7584a122
---

4b482de11537b4821e122eb20716fcec379f866b