From: The Android Automerger <android-build@google.com>
Date: Sun, 28 Sep 2014 13:10:26 +0000 (-0700)
Subject: merge in lmp-mr1-release history after reset to 71e351d96b551ccdbc39b52a0c66da86cae83701
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^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=7fe8b2b7d6135e691b27a57a5056e6b9b88c15af;p=android-x86%2Fframeworks-native.git

merge in lmp-mr1-release history after reset to 71e351d96b551ccdbc39b52a0c66da86cae83701
---

7fe8b2b7d6135e691b27a57a5056e6b9b88c15af