tree 40e8ae16ae61d1683574897d09673247b0766012
parent f5db6f4efdacbfdcb8cf446e8a0d38ead661f113
parent c8b5ab48b55514d440422bec5cdda18aca810c3b
author Jean-Baptiste Queru <jbq@google.com> 1327105965 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327105965 -0800

am dde686e2: (-s ours) am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"

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