OSDN Git Service

resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp
authorJake Hamby <jhamby@google.com>
Tue, 7 Jun 2011 23:24:15 +0000 (16:24 -0700)
committerJake Hamby <jhamby@google.com>
Tue, 7 Jun 2011 23:24:15 +0000 (16:24 -0700)
commitca1df0ccac686427880a1d29e8a12ae166753f9b
treec790c5fc8fa491fd5310bfe40fd410317fc45515
parentc7492c07b4103e326ba24b709ffa2eacc7d3c302
parentdf2590212745ce3beea59a2d5e6fc53ca64e4bd4
resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp

Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a