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

merge in lmp-mr1-release history after reset to 5105960d49bfa86efeeea8f87c87aa96b5771c37
---

1635df88c463f92b4734d5cd3b5f97f91ea4b4b6