OSDN Git Service

Merge "MPEG4Writer: fix diff between duration and timestamps" into oc-dr1-dev
authorRobert Shih <robertshih@google.com>
Sat, 17 Jun 2017 02:41:11 +0000 (02:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Jun 2017 02:41:11 +0000 (02:41 +0000)
am: fb8c3c5111

Change-Id: I871772f7818e5738620a949faabceec7a8c7750a


Trivial merge