tree 9221534061da689381081f81b1936dcd335843da
parent ac26ea8a79ff342f880eb04eedb82e983370a762
parent 6c4fc3a08e9ca52a36f7fc83b783185da34abc12
author Christopher Ferris <cferris@google.com> 1433897208 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433897208 +0000

am 6c4fc3a0: Merge "Change wtf errors from ASSERT to ERROR."

* commit '6c4fc3a08e9ca52a36f7fc83b783185da34abc12':
  Change wtf errors from ASSERT to ERROR.