OSDN Git Service

resolved conflicts for merge of 24297cab to gingerbread-plus-aosp
authorEd Heyl <ed@google.com>
Tue, 8 Mar 2011 22:12:25 +0000 (14:12 -0800)
committerEd Heyl <ed@google.com>
Tue, 8 Mar 2011 22:12:25 +0000 (14:12 -0800)
commitf50b9c4c85d2e6481f20c76cd14d8ac9f5f776f1
tree04f948e7a8e20cd5d84da4c507e5986bec7ab86f
parentb9c627c6a0c6f0af57d0912175bfc739b0eb6249
parent24297cabf4cd530e4ed4dc10db5cbc68f9ac7c7c
resolved conflicts for merge of 24297cab to gingerbread-plus-aosp

Change-Id: Ia10a4601b7156f6379d1663d811af45103ff81ff