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)
Change-Id: I68ff2cd2350721b43b6620c763cfbac5f6805beb


Trivial merge