tree 3ccb630c5939ab099e3097f6a7115bfbb3065a37
parent 153d6e55315122396afc0c1464d88c4209b4b078
parent 5059e65fec04c590eac6d74b1ff78a499f8c57a4
author Lajos Molnar <lajos@google.com> 1467044197 +0000
committer android-build-merger <android-build-merger@google.com> 1467044197 +0000

Merge \"media: document format keys for MediaMuxer\" into nyc-dev
am: 5059e65fec

Change-Id: If461a20e0fc2dabb62bbdf8bbfbc5d41ef803a85