OSDN Git Service

Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp...
authorWei Jia <wjia@google.com>
Fri, 14 Jul 2017 23:42:36 +0000 (23:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Jul 2017 23:42:36 +0000 (23:42 +0000)
am: 5445ddc983  -s ours

Change-Id: I556cccb83776d729f76b392192207637357f2292


Trivial merge