tree 1be077dd22139047b96e210d49cf01c4f7185fb3
parent 7a0495f2ac6f4d736ae722a1718e5d3e11f48753
parent 84f8ba632953b08fd9d73c1e152cef9c9652c961
author Vladimir Marko <vmarko@google.com> 1450395539 +0000
committer android-build-merger <android-build-merger@google.com> 1450395539 +0000

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

* commit '84f8ba632953b08fd9d73c1e152cef9c9652c961':
  Optimizing/ARM: Fix AddConstant() to adhere to set_cc.