reconcile main tree with open-source eclair beagle-eclair master beagle-eclair-0x4 beagle-eclair-0x5
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)
commit5b7c883da6527a411236592dd450893260485621
tree85226b322c93fd12fa78fa6d78166afba5886656
parentd5dc7761c9d77a6dc30cd3ffc1f7ec7e5a934df8
parent8aeca2d493fe8190e2621c1c51f176447faa60c3
reconcile main tree with open-source eclair