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

* commit '36fa42262d4642eb1bb55b39f68ae17a39a1698a':