tree 175b1968ca7341a4239007d51bda48d4877184f7
parent 2d688abd10db1a647c256115217d743d9baf6e67
parent 27e97c62dfa8e6b9ea478f50fc6794a65a1ea0ca
author Jean-Baptiste Queru <jbq@google.com> 1327022772 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327022772 -0800

am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"

* commit '6df477be186233e36fc370c4d2db6c1ed928a740':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)