From: The Android Automerger <android-build@google.com>
Date: Wed, 3 Sep 2014 13:10:53 +0000 (-0700)
Subject: merge in lmp-release history after reset to 453d633ba6351c8efc2103383ca178a0674bd373
X-Git-Tag: android-x86-6.0-r1~852^2~155^2~64^2~1^2^2^2~1^2~1^2~3^2~1^2^2~2^2~1^2^2^2^2~3^2~5^2~3^2^2^2~1^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0cc07218bf75577277d367a449baaf75c36906fb;p=android-x86%2Fframeworks-av.git

merge in lmp-release history after reset to 453d633ba6351c8efc2103383ca178a0674bd373
---

0cc07218bf75577277d367a449baaf75c36906fb