OSDN Git Service

resolved conflicts for merge of ba3ed0c7 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Wed, 8 Sep 2010 22:24:06 +0000 (15:24 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 8 Sep 2010 22:24:06 +0000 (15:24 -0700)
commite0cb0fd3f5c9626d90ea6907e63530d8e05067f9
treef0dcf64c48c889735846a0cb755735b739441f4d
parent0dda5a191df021a13c91d42109d55f4434b2c5da
parentba3ed0c7d0be642ca84b71a1a53fa1cfe6df4409
resolved conflicts for merge of ba3ed0c7 to gingerbread-plus-aosp

Change-Id: I68ff2cd2350721b43b6620c763cfbac5f6805beb