OSDN Git Service

resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp
authorGloria Wang <gwang@google.com>
Thu, 7 Oct 2010 22:27:17 +0000 (15:27 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 7 Oct 2010 22:27:17 +0000 (15:27 -0700)
commita34207b4f22849956a8b417f566c7493be62a36d
tree19aabb3f1a49b5b96b18c4b1ffd531bfbf2ceffa
parentc501b3049030f2cd39f1602b071351821f7b8fde
parent74d354972dc298b66a5878f28a96b45b007996ea
resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp

Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76