OSDN Git Service

resolved conflicts for merge 7bc0fb1b to honeycomb-plus-aosp
authorScott Main <smain@google.com>
Tue, 18 Jan 2011 03:56:23 +0000 (19:56 -0800)
committerScott Main <smain@google.com>
Tue, 18 Jan 2011 03:56:23 +0000 (19:56 -0800)
Change-Id: I32563b59c552a0ad3b07f300e3a1e450bd03826c


Trivial merge