tree b0637aabfd10b2d3478bc347e3c25f95d89efeb2
parent fd8bd2c43214baee1888884f302059db094fa824
parent dbd5ecad26e39281bb83f97664bc32555c5c071a
author Elliott Hughes <enh@google.com> 1336597032 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336597032 -0700

am dbd5ecad: resolved conflicts for merge of e5408907 to jb-dev-plus-aosp

* commit 'dbd5ecad26e39281bb83f97664bc32555c5c071a':
  [MIPS] Add support for MIPS syscalls