diff options
| author | David Friedman <dmail@google.com> | 2013-09-27 15:57:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-27 15:57:56 -0700 |
| commit | d42e4132bafe1b7cf6a665b6a0ed3160fe3ac991 (patch) | |
| tree | 5204314e10f1253c4de3f8295397b80773c6abb9 /media | |
| parent | 3f54532d72d834a41730501f42990c45393b2be1 (diff) | |
| parent | 233a341b6d9477f7f41d5a954fa7f7a150972ccb (diff) | |
| download | frameworks_base-d42e4132bafe1b7cf6a665b6a0ed3160fe3ac991.zip frameworks_base-d42e4132bafe1b7cf6a665b6a0ed3160fe3ac991.tar.gz frameworks_base-d42e4132bafe1b7cf6a665b6a0ed3160fe3ac991.tar.bz2 | |
am 233a341b: am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
* commit '233a341b6d9477f7f41d5a954fa7f7a150972ccb':
Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/SoundPool.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/SoundPool.java b/media/java/android/media/SoundPool.java index 5127479..06af5de 100644 --- a/media/java/android/media/SoundPool.java +++ b/media/java/android/media/SoundPool.java @@ -374,7 +374,7 @@ public class SoundPool { * Called when a sound has completed loading. * * @param soundPool SoundPool object from the load() method - * @param soundPool the sample ID of the sound loaded. + * @param sampleId the sample ID of the sound loaded. * @param status the status of the load operation (0 = success) */ public void onLoadComplete(SoundPool soundPool, int sampleId, int status); |