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)
commit153cebee2432a931773130bffa20e72a982c0107
treed7cbc6889af07bf34cd74122f9fb77a584212e4d
parent271397cfb2b79d1346568209b37b1f57707f924a
parentf722cecd182b909eae3dc6ec7f41900b53ba45c1
resolved conflicts for merge of f722cecd to honeycomb-plus-aosp

Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f