am 4ba9e68f: am b8942108: Merge "Video Editor:Fix for 3375632" into honeycomb
am 4ba9e68f: am b8942108: Merge "Video Editor:Fix for 3375632" into honeycomb

* commit '4ba9e68fa95c59e4f2c7c6b17a663b10a5405f45':
  Video Editor:Fix for 3375632

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