tree 134e15b19ed1988c5125a68108d72b37c56e079b
parent c98359cc6bffdffe03067740a0ad691cc16d83fa
parent 80cff53e138cca6c2634e08f5ed1198facc7adb6
author Elliott Hughes <enh@google.com> 1400258568 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400258568 +0000

am 80cff53e: am 2a602272: Merge "Move libstdc++ into libc."

* commit '80cff53e138cca6c2634e08f5ed1198facc7adb6':
  Move libstdc++ into libc.