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: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)
commit5bbcf18ea3e31cae5012ce26565daa0a21d89d95
treea5d3ea486b907c77abd820d7df12fb224ed0a417
parent6934ac109bf80019d70ea684c203f12ca58c365e
parenta81cef2c38d3a2ee610ff7fff2e775c243ec8543
reconcile main tree with open-source eclair