diff options
| author | David Friedman <dmail@google.com> | 2013-09-27 17:24:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-27 17:24:41 +0000 |
| commit | 8c38ea39203016dde95bc5dd68f27f6f45096784 (patch) | |
| tree | 0b31586fa253bd3adf3ce8afa9665ff21eee5849 /media | |
| parent | 23bd5927f1c82f3f63288fbee4e7c460fca3dc4e (diff) | |
| parent | 36b692d8ef595eee1e28d20b740be548365a5671 (diff) | |
| download | frameworks_base-8c38ea39203016dde95bc5dd68f27f6f45096784.zip frameworks_base-8c38ea39203016dde95bc5dd68f27f6f45096784.tar.gz frameworks_base-8c38ea39203016dde95bc5dd68f27f6f45096784.tar.bz2 | |
Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
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); |