tree 2587ada77e7ea9621f05df982b93052e6d30dfc0
parent 73633790805606b00fcd3e1a03d06f0dfc0ec27c
parent e7af79d89d5c5d3dd7753e9421e11ea6fe7cb19f
author Dan Albert <danalbert@google.com> 1401481254 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401481254 +0000

am e7af79d8: Merge "Revert "Switch to libc++""

* commit 'e7af79d89d5c5d3dd7753e9421e11ea6fe7cb19f':
  Revert "Switch to libc++"