am 7da27478: Merge "android_media_MediaMuxer_setLocation: amended signature."
am 7da27478: Merge "android_media_MediaMuxer_setLocation: amended signature."

* commit '7da27478ea09d7e6c8e6bb8c563ea6439c53e28f':
  android_media_MediaMuxer_setLocation: amended signature.

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