am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV"

* commit '12f1f5b87326a31f4c69e949a1e645e82c9152d4':
  frameworks/base: fix errors inside ALOGV