am 09ec3e30: Merge "Disable content transitions, they are not implemented yet"
am 09ec3e30: Merge "Disable content transitions, they are not implemented yet"

* commit '09ec3e30b71d0bd8d5b711ffd68fbeb27a0930fb':
  Disable content transitions, they are not implemented yet

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