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:36 +0000 (08:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:36 +0000 (08:09 -0800)
commitf3a3bb36a154bd29386ab75f2ebd2d60fcba8f18
tree6257b2f6f6da5f9695e34d6c97fe2fa0323cb357
parentbd55e7247ae4c6b3ac5d5de3d8ae9669565cd010
parentee6f9ffd9d7d58de8e7505495b9025ab4e28ab7a
reconcile main tree with open-source eclair