From: Nicolas Geoffray <ngeoffray@google.com>
Date: Tue, 3 Feb 2015 14:38:44 +0000 (+0000)
Subject: am 936a2ce0: am 0b87c470: Merge "Fix thumb2 assembler\'s ShifterOperandCanHold."
X-Git-Tag: android-x86-6.0-r1~145^2~686
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=be9d3f870792ac70a23701ddd621ef479d35bc7b;p=android-x86%2Fart.git

am 936a2ce0: am 0b87c470: Merge "Fix thumb2 assembler\'s ShifterOperandCanHold."

* commit '936a2ce0aa12785c2042c39659d399140fcf8cf0':
  Fix thumb2 assembler's ShifterOperandCanHold.
---

be9d3f870792ac70a23701ddd621ef479d35bc7b