tree 62cfd5c53cafbf8a2a9f5d3f5095aa68a59eadf2
parent daef36f5d4934bd055c694a8d54b86e2b50a6159
parent 9a8ded7348c5b2302dd27b285b395416bc842c49
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)