am 6f954b7a: am 36fa4226: (-s ours) am 708e5438: am 41a0654e: Merge "Replace all _LOG error calls with ALOGE."

* commit '6f954b7ae2ac671c6bf5433fb47d3912c57c05e6':