am 2aaa7764: Merge "VideoEditor:Fix for 3369908" into honeycomb
am 2aaa7764: Merge "VideoEditor:Fix for 3369908" into honeycomb

* commit '2aaa776429f58069e25c8160a9e5b9a969f6e993':
  VideoEditor:Fix for 3369908

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