OSDN Git Service

resolved conflicts for merge of bcbb5845 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Tue, 17 Aug 2010 14:41:59 +0000 (07:41 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 17 Aug 2010 14:41:59 +0000 (07:41 -0700)
Change-Id: I04fb94c91958bcba3e587a8bf523c551d964f761


Trivial merge