OSDN Git Service

resolved conflicts for merge of 3a223404 to honeycomb-merge
authorJeff Hamilton <jham@android.com>
Thu, 27 Jan 2011 17:27:58 +0000 (11:27 -0600)
committerJeff Hamilton <jham@android.com>
Thu, 27 Jan 2011 17:27:58 +0000 (11:27 -0600)
commit5ea972650d2703818e9147d9550d359d324ba0ed
tree6a90d2de1dbfdd2e78815cffa70373fa433f56c1
parent55d5267436a5ac0f5f8666da9de066644ad26eb8
parent7b6ecc4edd54fa5ec9e222f0223b7708b7b53b96
resolved conflicts for merge of 3a223404 to honeycomb-merge

Change-Id: I0eb1f3a271797c78d9ec5b2528a221c89973a83c