From: The Android Automerger <android-build@google.com>
Date: Wed, 5 Nov 2014 14:13:00 +0000 (-0800)
Subject: merge in lmp-mr1-release history after reset to 9cea6ccbd8789f9583c78ce2b36ac5dd75717b6c
X-Git-Tag: android-x86-6.0-r1~270^2~23^2~1^2~1^2^2~1^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fb4dbc40d15cadc8ca14462c31c4d5ef1e01eb6e;p=android-x86%2Fframeworks-native.git

merge in lmp-mr1-release history after reset to 9cea6ccbd8789f9583c78ce2b36ac5dd75717b6c
---

fb4dbc40d15cadc8ca14462c31c4d5ef1e01eb6e