commit | 9da75524d1269bd12bea4f2873f2241a1dbd5a44 | [log] [tgz] |
---|---|---|
author | David Friedman <dmail@google.com> | Mon Sep 30 14:16:57 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 30 14:16:57 2013 -0700 |
tree | 86b0d576696c8c610c5b1facbff570abfc1c5959 | |
parent | 923f9e90b387646ccdae4ccdf60393a9d0bc9cd9 [diff] | |
parent | d42e4132bafe1b7cf6a665b6a0ed3160fe3ac991 [diff] |
am d42e4132: 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 'd42e4132bafe1b7cf6a665b6a0ed3160fe3ac991': Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994