OSDN Git Service

resolved conflicts for merge of b368bba4 to gingerbread-plus-aosp
authorYing Wang <wangying@google.com>
Thu, 23 Sep 2010 00:34:05 +0000 (17:34 -0700)
committerYing Wang <wangying@google.com>
Thu, 23 Sep 2010 00:34:05 +0000 (17:34 -0700)
commit67e0c2a6bdcc72026a7c3e7263ce2cbe48d18215
tree5a82b14e798bfdb0c4dbff077a871d9931b75c85
parent9f28f0d76e31c9cce0aecb06091cf0e40b44fd0e
parentb368bba41c4fb9b5c76a56cb1bd850517ef9df53
resolved conflicts for merge of b368bba4 to gingerbread-plus-aosp

Change-Id: I50e3e45d2cd1d0a2c01f256e8f53ea4c8b2668c8