OSDN Git Service

am 7f9551f7: MediaMuxer: Hook up setLocation method
authorZhijun He <zhijunhe@google.com>
Tue, 10 Sep 2013 19:02:54 +0000 (12:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 10 Sep 2013 19:02:54 +0000 (12:02 -0700)
* commit '7f9551f75eedb3e4e1fe8feaaba48d8080635fc4':
  MediaMuxer: Hook up setLocation method


Trivial merge