tree 736f13ca8dbe95aef73f5b3e6988adc9205eebe5
parent c9231d4208abdf57a833f449a351f2f930d185d2
parent 69879574170ea0d1e4ce3ad17f2e23665b256733
author Andrew Hsieh <andrewhsieh@google.com> 1436114887 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436114887 +0000

am 69879574: (-s ours) Merge "MIPS kernel-qemu"

* commit '69879574170ea0d1e4ce3ad17f2e23665b256733':
  MIPS kernel-qemu