tree 0b31586fa253bd3adf3ce8afa9665ff21eee5849
parent 23bd5927f1c82f3f63288fbee4e7c460fca3dc4e
parent 36b692d8ef595eee1e28d20b740be548365a5671
author David Friedman <dmail@google.com> 1380302681 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1380302681 +0000

Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs