| commit | 43590eb76cac78f780dd318492c5fe6093e2fa88 | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Fri May 31 11:07:35 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 31 11:07:35 2013 -0700 |
| tree | 4125824fcb73b996a88f662ffa1f7a5ea17b182d | |
| parent | 6caecdebbf568782cab5c8ad4536683e5c25e7ff [diff] | |
| parent | 4f0002e6de601f6727475a3296618120b62d7f12 [diff] |
am 4f0002e6: Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev * commit '4f0002e6de601f6727475a3296618120b62d7f12': MediaMuxer sample code update, no functional change