tree 293b68b2b751bde83e25d2e005acdfa9b992268b
parent a2ade148e34988b19b0e3f5d166c9f71be6e7f47
parent 0ac7a8e505e14e65ff989c483a40348a3d4b6a86
author Vladimir Marko <vmarko@google.com> 1450365736 -0800
committer android-build-merger <android-build-merger@google.com> 1450365736 -0800

Merge "Optimizing/ARM: Fix AddConstant() to adhere to set_cc."
am: 0ac7a8e505

* commit '0ac7a8e505e14e65ff989c483a40348a3d4b6a86':
  Optimizing/ARM: Fix AddConstant() to adhere to set_cc.