From: Mike Lockwood <lockwood@google.com>
Date: Tue, 3 Apr 2012 17:39:53 +0000 (-0700)
Subject: Merge remote-tracking branch 'goog/ics-aah'
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-common.git;a=commitdiff_plain;h=07d886693b88cde857046ab01cc07abf8df903af

Merge remote-tracking branch 'goog/ics-aah'
---

07d886693b88cde857046ab01cc07abf8df903af