From: The Android Automerger <android-build@google.com>
Date: Sat, 11 Oct 2014 13:10:25 +0000 (-0700)
Subject: merge in lmp-mr1-release history after reset to 16410d458fdf9915dc8cb82b1bae3949a8100124
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
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=92d28005f9a79bcc390c5abda930800bd1102c8f;p=android-x86%2Fframeworks-native.git

merge in lmp-mr1-release history after reset to 16410d458fdf9915dc8cb82b1bae3949a8100124
---

92d28005f9a79bcc390c5abda930800bd1102c8f