reconcile main tree with open-source eclair beagle-eclair-0x4 beagle-eclair-0x5
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:39 +0000 (08:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:39 +0000 (08:09 -0800)
commit338259f2740ec47ceb26ffa9d89341d1106e61b0
tree76b13e60b2bf8659fb1da6288d3b283ab88a0d8f
parent499e3b0ab79d8c1b0042f3b5d0beea05ec5bdbc0
parentf2fd399da8fc17b020d4439748936370cdf2e5e5
reconcile main tree with open-source eclair