tree fff4c978460aadba48d7b94c06427bac6e890694
parent 6376b84869141d8fbecc998ab97f6681c9cbefd9
parent 8226f95d450857358fd08319a906c83739bd5035
author Andrew Hsieh <andrewhsieh@google.com> 1420683766 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420683766 +0000

am 8226f95d: Merge "Rename mipsr6 as mips32r6"

* commit '8226f95d450857358fd08319a906c83739bd5035':
  Rename mipsr6 as mips32r6