OSDN Git Service

resolved conflicts for merge of 5a726729 to gingerbread
authorScott Main <smain@google.com>
Wed, 10 Nov 2010 22:46:44 +0000 (14:46 -0800)
committerScott Main <smain@google.com>
Wed, 10 Nov 2010 22:46:44 +0000 (14:46 -0800)
commitee6ceed44aa5d6bb88de8ee1e3cf351754667eac
treeaf2b6a6ebf410af827603e463c6bd802ba9aeb07
parent70745094cc6013ec9dcab0952016cff11d62e1fe
parent5eb239555c293a42cd7e0f1cf9dfed0453b292cc
resolved conflicts for merge of 5a726729 to gingerbread

Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15