tree 08e6e3c160452277e625ab401819309a92549e5c
parent 13d953984b736d4a3c664407168fd7ef74433a92
parent 3bb112ae3c4c118e566ae30c97382b352c090e67
author Ray Chen <raychen@google.com> 1270669609 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1270669609 -0700

am 3bb112ae: am f617797e: Merge "API Change: MediaScannerConnection.ScanResultListener -> MediaScannerConnection.OnScanCompletedListener." into froyo