From: The Android Automerger <android-build@google.com>
Date: Thu, 2 Oct 2014 13:14:43 +0000 (-0700)
Subject: merge in lmp-mr1-release history after reset to 5ee2c9d20c0fbecf6b4a482eb8d8bfdf85d0d424
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
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bcf2820b24017f943b4e44cbaec92b7b9c920156;p=android-x86%2Fframeworks-native.git

merge in lmp-mr1-release history after reset to 5ee2c9d20c0fbecf6b4a482eb8d8bfdf85d0d424
---

bcf2820b24017f943b4e44cbaec92b7b9c920156