25c2dd60
Merge commit '25c2dd60d43298c18b9459abd6ff33046d675fe6' into froyo-plus-aosp * commit '25c2dd60d43298c18b9459abd6ff33046d675fe6': Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener