am 683028ca: Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev
am 683028ca: Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev

* commit '683028ca0dab7b5cf7afff4501c2372350231bae':
  Make it clear that non-optional MediaFormat keys are required

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