am 98c651a2: am 9d1ee7e1: am 2f0fd42e: Merge "Throw IAE on invalid scale" into lmp-dev
am 98c651a2: am 9d1ee7e1: am 2f0fd42e: Merge "Throw IAE on invalid scale" into lmp-dev

* commit '98c651a222ae8e26ba4c8899b8922e2ea6e877f1':
  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