OSDN Git Service

resolved conflicts for merge of f722cecd to honeycomb-plus-aosp
authorScott Main <smain@google.com>
Wed, 16 Feb 2011 20:08:36 +0000 (12:08 -0800)
committerScott Main <smain@google.com>
Wed, 16 Feb 2011 20:08:36 +0000 (12:08 -0800)
Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f


Trivial merge