diff options
| author | David Friedman <dmail@google.com> | 2013-09-27 10:30:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-27 10:30:01 -0700 |
| commit | 1b8e319784a1bb166aaa6b0f1dc306f8d4b6e57f (patch) | |
| tree | bf1ae1e27a3d55857e3c93e0479252a223c41c97 /media | |
| parent | b648f9509b17bad806c907ffa5270901a86e6c06 (diff) | |
| parent | 8c38ea39203016dde95bc5dd68f27f6f45096784 (diff) | |
| download | frameworks_base-1b8e319784a1bb166aaa6b0f1dc306f8d4b6e57f.zip frameworks_base-1b8e319784a1bb166aaa6b0f1dc306f8d4b6e57f.tar.gz frameworks_base-1b8e319784a1bb166aaa6b0f1dc306f8d4b6e57f.tar.bz2 | |
am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
* commit '8c38ea39203016dde95bc5dd68f27f6f45096784':
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 587af47..acbf03a 100644 --- a/media/java/android/media/SoundPool.java +++ b/media/java/android/media/SoundPool.java @@ -410,7 +410,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); |