From: Ed Heyl <ed@google.com>
Date: Tue, 3 Jul 2012 20:57:52 +0000 (-0700)
Subject: Merge "4.1.1" into jb-dev
X-Git-Tag: android-x86-4.4-r1~939^2~8^2~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c4c39f4d01ae569d1c3d05aab0cf79d92772ee94;p=android-x86%2Fbuild.git

Merge "4.1.1" into jb-dev
---

c4c39f4d01ae569d1c3d05aab0cf79d92772ee94