OSDN Git Service

resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE
authorJean-Baptiste Queru <jbq@google.com>
Wed, 15 Dec 2010 00:11:06 +0000 (16:11 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 15 Dec 2010 00:12:23 +0000 (16:12 -0800)
commit3463d0e1026263d9d740c3324138a346b0c9006d
tree286a4a4a32c34e16b09c2df531bd855557b7f084
parentefc5d81428a8c7d9cf7cb7b3a5f1a8344b02a700
parentc1b330818e06cf5a3dc8d342e941eba5bce0929a
resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE

Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221
core/version_defaults.mk