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

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