OSDN Git Service

resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
authorRobert Greenwalt <rgreenwalt@google.com>
Thu, 7 Apr 2011 21:13:52 +0000 (14:13 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Thu, 7 Apr 2011 21:13:52 +0000 (14:13 -0700)
commitf3eae4d6b86a788289ed79fbdda9ee7ef09275a3
tree2aa2cb6936c908494527967d2b865eaf6392b787
parent62a2b945b5d7f0d2981a9055f66228b01ffd84d1
parent409496a3068e25d2e945e81dd54827345067ba14
resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp

Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f