tree 69a67164c681e2bc4e33f90cafc916a02ee20d67
parent 96a5d1d496518fa6130514f099e928f983bf70d7
parent e0ba566aaee0490d77caa29fcc236ccdc20e121e
author Hangyu Kuang <hkuang@google.com> 1505426139 +0000
committer android-build-merger <android-build-merger@google.com> 1505426139 +0000

Merge "MediaMuxer: Fix a typo in java doc." into oc-mr1-dev am: 7dd0c6924e
am: e0ba566aae

Change-Id: Idb8cbe7ee53e8d3eb2cc59b6fc163f88adad4df0