From: The Android Automerger <android-build@android.com>
Date: Mon, 26 Mar 2012 14:08:07 +0000 (-0700)
Subject: merge in jb-release history after reset to master
X-Git-Tag: android-x86-7.1-r1~584^2^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=036233f6fbf27c6b39770870a2fa31f5d7062e3b;p=android-x86%2Fsystem-media.git

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

036233f6fbf27c6b39770870a2fa31f5d7062e3b