tree 0f853c7dd38c0b23d43eda12cc6fc07fde603f0e
parent 4334ca6ea78fcd20cccd9b3f6f1eb6b92879ad34
parent 9909c0bab467f3a338f1e7a9ecd9e7035f91403a
author Hangyu Kuang <hkuang@google.com> 1503543065 +0000
committer android-build-merger <android-build-merger@google.com> 1503543065 +0000

Merge "MPEG4Writer: Save container metadata during switching file output" into oc-mr1-dev am: 6ec6a109df
am: 9909c0bab4

Change-Id: I2ab92f67312bfc5791fd02b6a54a309889eb6d0c