am fd266b36: (-s ours) am 36b48c30: am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()"

* commit 'fd266b36826aa6dd8cd3fa00c159a094423899fb':
  Rename (IF_)LOG() to (IF_)ALOG()