OSDN Git Service

resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp
authorSvetoslav Ganov <svetoslavganov@google.com>
Fri, 25 Feb 2011 20:39:59 +0000 (12:39 -0800)
committerSvetoslav Ganov <svetoslavganov@google.com>
Fri, 25 Feb 2011 20:39:59 +0000 (12:39 -0800)
Change-Id: I687ca9b7873890e3b30da16d5dde6b57ce92f0d6


Trivial merge