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)
commitdecf70804b71d8f05f7ca8614166aae5f6ebec44
treef81a5ac2c427830beee43f166f8e9c194b080204
parentecd48ece32418bc01bd134a84132a66d33463fb0
parent305f3882641716692f36e4969c98fe23e692fd9b
reconcile main tree with open-source eclair