From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 15 Dec 2010 00:15:12 +0000 (-0800)
Subject: am 3463d0e1: (-s ours) resolved conflicts for merge of c1b33081 to gingerbread-plus... 
X-Git-Tag: android-x86-4.4-r1~1992
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=282d39123949ca76ac96af79bdfb29407b723d02;p=android-x86%2Fbuild.git

am 3463d0e1: (-s ours) resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE

* commit '3463d0e1026263d9d740c3324138a346b0c9006d':
  (DO NOT MERGE) Issue #3255640: Need to bump GB to API 10 version name "2.4"
---

282d39123949ca76ac96af79bdfb29407b723d02