OSDN Git Service

resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 28 Jan 2011 17:06:30 +0000 (09:06 -0800)
committerRobert Greenwalt <rgreenwalt@google.com>
Fri, 28 Jan 2011 17:06:30 +0000 (09:06 -0800)
Change-Id: Ib9d24c211461329955288180978a7c5d383bba75


Trivial merge