am 1955ee57: Merge "Make VPA.setInterpolator(null) unset the interpolator." into mnc-dev
am 1955ee57: Merge "Make VPA.setInterpolator(null) unset the interpolator." into mnc-dev

* commit '1955ee57b3210d9027e1c46731cf1f44406166da':
  Make VPA.setInterpolator(null) unset the interpolator.

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