tree dbb3c6ea45cb910397cec50054460d46c99b454f
parent 9b0ebf992e01960db42ab7debf02bb25b372c734
parent 23017c5d5c145a1040ee49466d30489d6e11bb61
author Elliott Hughes <enh@google.com> 1428699833 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428699833 +0000

am 23017c5d: Merge "Switch minui over to C++."

* commit '23017c5d5c145a1040ee49466d30489d6e11bb61':
  Switch minui over to C++.