OSDN Git Service

resolved conflicts for merge of a1727092 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Mon, 30 Aug 2010 21:13:18 +0000 (14:13 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 30 Aug 2010 21:13:18 +0000 (14:13 -0700)
Change-Id: Icce8b9cb0c6ebfe2c4278c19c50aafb85a9ba4d8


Trivial merge