commit | d42e4132bafe1b7cf6a665b6a0ed3160fe3ac991 | [log] [tgz] |
---|---|---|
author | David Friedman <dmail@google.com> | Fri Sep 27 15:57:56 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 27 15:57:56 2013 -0700 |
tree | 5204314e10f1253c4de3f8295397b80773c6abb9 | |
parent | 3f54532d72d834a41730501f42990c45393b2be1 [diff] | |
parent | 233a341b6d9477f7f41d5a954fa7f7a150972ccb [diff] |
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 '233a341b6d9477f7f41d5a954fa7f7a150972ccb': Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994