reconcile main tree with open-source eclair master beagle-eclair-0x4 beagle-eclair-0x5
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:37 +0000 (08:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:37 +0000 (08:09 -0800)
commit520d66ec4145f22ecfd34581ddd52578bd39a964
tree16e88a8f8987269396579b660202378c04096c92
parentd9271b927ffc02a8afa407efe56452c26b3fde41
parent08125c972e745a543dbc512255f5afe59777b2cb
reconcile main tree with open-source eclair