tree 195b8ec38f5b1e95a375d4a49503a3d923780f69
parent d746737921074e2a6c39c52b06022c5166689df5
parent 39fd8eb956dea32692d3d72b10b64a8597df0a40
author Jean-Baptiste Queru <jbq@google.com> 1327022776 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327022776 -0800

am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"

* commit '9d25b82d280c2d979d500e7da4447148f32f820b':
  Rename LOG_ASSERT to ALOG_ASSERT