tree aa6f062812e30d66427e0363d463baa1c5149f5e
parent 4ed586e80dbdc5dec3a733db87bae635c84b0337
author Steve Block <steveblock@google.com> 1319563695 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319563695 -0700

am 1663a6c1: (-s ours) Rename (IF_)LOG() to (IF_)ALOG()  DO NOT MERGE

* commit '1663a6c12fdf4732d7ea0a0406af6085b3c408e4':
  Rename (IF_)LOG() to (IF_)ALOG()  DO NOT MERGE