From: The Android Automerger <android-build@google.com>
Date: Tue, 2 Sep 2014 13:12:14 +0000 (-0700)
Subject: merge in lmp-release history after reset to bcbf97ef8fb6eaf527014ed9e7d979ad4fe9fdd2
X-Git-Tag: android-x86-6.0-r1~270^2~77^2~1^2^2^2~1^2^2^2^2^2~1^2^2^2^2^2~1^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c0f4e9d2173d27521295eece510ab4e9d650a834;p=android-x86%2Fframeworks-native.git

merge in lmp-release history after reset to bcbf97ef8fb6eaf527014ed9e7d979ad4fe9fdd2
---

c0f4e9d2173d27521295eece510ab4e9d650a834