tree 1519a54afeeaa1eaf6efd655231073adec804bc5
parent 85558f701ee6f155f98c80b64fd46d9589db4c5f
parent 667e84bb0b221c9cedf149e4fde14fcd576a37c2
author Dimitry Ivanov <dimitry@google.com> 1445633618 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1445633618 +0000

Merge changes I3d6f4dd4,I8b538cc8,Id7ba841d

* changes:
  Fix for unhandled sub.w rD, sp, rM, lsl N
  Fix the build after sync with upstream
  Merge remote-tracking branch 'aosp/upstream-master' into mymerge