Merge commit 'ac94fbd081450ae7f208e4525b23b36d90d382e0' * commit 'ac94fbd081450ae7f208e4525b23b36d90d382e0': Capture failure of copybit->stretch() Fix obvious typo bug in egl.cpp LocationManagerService: Fix race when removing LocationListener Don't return when blocking is true. Fix of compatibility with multifunction extUSB adapters. Fix documentation example, per issue 895 on android.googlecode.com