Reconcile with gingerbread-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 May 2011 21:06:24 +0000 (14:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 May 2011 21:06:24 +0000 (14:06 -0700)
commit94d5875cb6f43343df5134bc4f817012423b67ef
treea1f122b297cb21566b8059139b7f0cf3a4fee055
parent11363ebbc6404eda84dbd10b7666612cade0c497
parent4b1e01421a564b348fcf7c0203dcb89576883aff
Reconcile with gingerbread-release

Change-Id: I7325e4527f86eac12e097e2185f231529db7368c