OSDN Git Service

resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
authorrepo sync <andih@google.com>
Tue, 11 Jan 2011 23:26:51 +0000 (15:26 -0800)
committerrepo sync <andih@google.com>
Tue, 11 Jan 2011 23:26:51 +0000 (15:26 -0800)
Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26


Trivial merge