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

merge in lmp-release history after reset to 2ab32d6915eee0e0c175f0c5ae9d78ab0a90791d
---

a9a104def3da99d87e028ac92965d7103a2331d5