tree b7dda06a4111a2c7da34d41949cf288ad535a768
parent e744a90eb52bf9547848c08380cfb7ba7e63ffbc
parent 53feeb42c721e8fc9285e35e679906a951f3277c
author Jean-Baptiste Queru <jbq@google.com> 1327022763 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327022763 -0800

am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"

* commit '4f367f3387887c538c81c34cc8becaea6fa5e430':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)