| commit | 8c75967799727119eeb2ac72db51b82348178d1b | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Mon Apr 08 10:31:17 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 08 10:31:17 2013 -0700 |
| tree | 7bfb00d461d2e871afb7a9d6c8a88b5f27b04f13 | |
| parent | 24670fada20fbcfd8b66a0cb8afd48b5209bc563 [diff] | |
| parent | 34dd708a21ef49f22877c262e0fec07872624087 [diff] |
am 34dd708a: am 50b9eb1c: Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev * commit '34dd708a21ef49f22877c262e0fec07872624087': Update the documentiation for MediaMuxer::writeSampleData()