From: The Android Automerger <android-build@google.com>
Date: Tue, 25 Mar 2014 12:49:53 +0000 (-0700)
Subject: merge in master-release history after reset to master
X-Git-Tag: android-x86-6.0-r1~2001^2~35^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~1^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e4a056cb724e8212531de16a969366e654365f35;p=android-x86%2Fframeworks-av.git

merge in master-release history after reset to master
---

e4a056cb724e8212531de16a969366e654365f35