am 3c0624aa: Merge "Forward compatibility fix"
am 3c0624aa: Merge "Forward compatibility fix"

* commit '3c0624aa1ae9c7d147a3b0f3ea8c05fc4bc4187a':
  Forward compatibility fix

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