From: The Android Automerger <android-build@google.com>
Date: Sat, 26 Jul 2014 13:09:48 +0000 (-0700)
Subject: merge in lmp-release history after reset to d8e5e813433c5c5e4fea29a24d993b5cfe436fe0
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^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~1^2^2^2~1^2^2^2^2^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8a6c934580dd1f76c754028ec5df00d12e645c47;p=android-x86%2Fframeworks-native.git

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

8a6c934580dd1f76c754028ec5df00d12e645c47