| commit | b87857b50b46d7348a7f563541ffa9f416e5ae27 | [log] [tgz] |
|---|---|---|
| author | Zhijun He <zhijunhe@google.com> | Tue Sep 10 12:48:13 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 10 12:48:13 2013 -0700 |
| tree | 67c0199d0d428e8057c50c2ecfa11afc87ae1e40 | |
| parent | 9ee368039788690052b96ab40494dcae83d09a28 [diff] | |
| parent | 487a8fc9d487a68159c57b4de896ba7be88f1c2b [diff] |
am 487a8fc9: am 82d11f8e: Merge "MediaMuxer: Add setLocation API" into klp-dev * commit '487a8fc9d487a68159c57b4de896ba7be88f1c2b': MediaMuxer: Add setLocation API