am 2f0fd42e: Merge "Throw IAE on invalid scale" into lmp-dev
am 2f0fd42e: Merge "Throw IAE on invalid scale" into lmp-dev

* commit '2f0fd42ef1ab252b75f772763ca2624acf1f1156':
  Throw IAE on invalid scale

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