tree e65ad810626c2c0ef37801806c8072c07056ed7c
parent 3016e34beba2b977ec1dc1897f4a311ceb7cee2d
parent 2ff6099854691e3406a17797d4aa83624174e6f4
author Elliott Hughes <enh@google.com> 1344711188 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344711188 -0700

am 2ff60998: am 605f8706: Merge "Add Mips architecture to system/core/include"

* commit '2ff6099854691e3406a17797d4aa83624174e6f4':
  Add Mips architecture to system/core/include