am ba8bfedd: reconcile main tree with open-source eclair
Merge commit 'ba8bfedd04824eea944236ffc885f866c5e9c651' into eclair-plus-aosp * commit 'ba8bfedd04824eea944236ffc885f866c5e9c651': android-2.1_r1 snapshot
This commit is contained in:
commit
1db874720a