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

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