am 4f0002e6: Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev
am 4f0002e6: Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev

* commit '4f0002e6de601f6727475a3296618120b62d7f12':
  MediaMuxer sample code update, no functional change

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base