tree b8d170d3028bddddf5c3f591e4542103376539ea
parent 36f536fc7b88fe21a974bce6fed565bc622b5bc2
parent 570cd46d14645f622e9972671308fdb4f2425292
author Dan Albert <danalbert@google.com> 1401481052 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401481052 +0000

am 570cd46d: Merge "Revert "Move libutils to libc++""

* commit '570cd46d14645f622e9972671308fdb4f2425292':
  Revert "Move libutils to libc++"