tree aeff9821f00ea2cc5b00cd5c270ef1964c840f97
parent 3051ddd13a45e61b2ace9459a0657ddf892c39db
parent 58f4a09bb4375c2f7b85ec14449a0588e85e126a
author Dan Albert <danalbert@google.com> 1401476505 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401476505 +0000

am 58f4a09b: am 36f536fc: am 9f69e028: Merge "Move libutils to libc++"

* commit '58f4a09bb4375c2f7b85ec14449a0588e85e126a':
  Move libutils to libc++