From: Ed Heyl <ed@google.com>
Date: Thu, 26 Jul 2012 14:45:43 +0000 (-0700)
Subject: resolved conflict in mergre to goog/master
X-Git-Tag: android-x86-4.4-r1~942
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f8a30598;p=android-x86%2Fbuild.git

resolved conflict in mergre to goog/master

Change-Id: I6ee3a8802595786a91a1bd77188648fda9dc3447
---

f8a30598925855cb387511d32a5b3388ebc908c8