commit | 487a8fc9d487a68159c57b4de896ba7be88f1c2b | [log] [tgz] |
---|---|---|
author | Zhijun He <zhijunhe@google.com> | Tue Sep 10 12:43:59 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 10 12:43:59 2013 -0700 |
tree | 0a6ddfe9adbabe1002bd665ebb256bade3fd7833 | |
parent | 900e04c1a2e0529a9a99be12222efccd5f74e306 [diff] | |
parent | 82d11f8e94e38e434cb6bc5e3e8d87250956fa1c [diff] |
am 82d11f8e: Merge "MediaMuxer: Add setLocation API" into klp-dev * commit '82d11f8e94e38e434cb6bc5e3e8d87250956fa1c': MediaMuxer: Add setLocation API