OSDN Git Service

resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp
authorNick Pelly <npelly@google.com>
Tue, 25 Jan 2011 18:26:54 +0000 (10:26 -0800)
committerNick Pelly <npelly@google.com>
Tue, 25 Jan 2011 18:26:54 +0000 (10:26 -0800)
Change-Id: I1fcb292287f82605db41d330ae840fb5f617847b


Trivial merge