am d33e21a7: am 0e7368a5: (-s ours) am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."

* commit 'd33e21a7ae7b37590ad41fac56f87141c597616c':