OSDN Git Service

resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Oct 2010 16:38:10 +0000 (09:38 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 11 Oct 2010 16:38:10 +0000 (09:38 -0700)
Change-Id: I2f90572163e7cb98e4e2762998a2ac63cc267dea


Trivial merge