OSDN Git Service

am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed...
authorDavid Friedman <dmail@google.com>
Fri, 27 Sep 2013 17:37:07 +0000 (10:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Sep 2013 17:37:07 +0000 (10:37 -0700)
* commit '1b8e319784a1bb166aaa6b0f1dc306f8d4b6e57f':
  Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994


Trivial merge