tree 3c40600b7a00690c12bb71c86d311cf169efa8e4
parent 62b16e2e10e488eb69ae0d11d43c7693ad809ec2
parent 10eb6ab94b932c33a708e007b0681b26930260e3
author Chris Craik <ccraik@google.com> 1446665591 +0000
committer android-build-merger <android-build-merger@google.com> 1446665591 +0000

Merge "Early return when the scale is 0." into mnc-dr-dev
am: 10eb6ab94b

* commit '10eb6ab94b932c33a708e007b0681b26930260e3':
  Early return when the scale is 0.