reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:33 +0000 (08:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:33 +0000 (08:09 -0800)
commit572f793bcdcae936229709941bb3af46473af159
tree936b00e763106a28dd58b7ae890ccf8117282ba9
parent4a1eff18c4d5dd497444006cdfd4cca92cfa69e5
parenta1206e95836314724ce485c6c678d778a8d2366b
reconcile main tree with open-source eclair