From: Marius Renn <renn@google.com>
Date: Sun, 12 Jun 2011 18:37:20 +0000 (-0700)
Subject: Merge "Code clean up."
X-Git-Tag: android-x86-7.1-r1~964
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2dbe9a3b7a1fb1e8f48db040f2685049eb115d5c;p=android-x86%2Fsystem-media.git

Merge "Code clean up."
---

2dbe9a3b7a1fb1e8f48db040f2685049eb115d5c