am 3463d0e1: (-s ours) resolved conflicts for merge of c1b33081 to...
am 3463d0e1: (-s ours) resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE
* commit '3463d0e1':
(DO NOT MERGE) Issue #3255640: Need to bump GB to API 10 version name "2.4"