tree 40e8ae16ae61d1683574897d09673247b0766012
parent 2ae2b734a28544a7eca4241bea2d6b60c50b40e5
parent 22d95dfc329abc8bbb1c149c21781834d6f977bf
author Jean-Baptiste Queru <jbq@google.com> 1327106269 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327106269 -0800

am 45470559: (-s ours) am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"

* commit '45470559cd4a499fd5d38cf708f0b531dc081fed':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)