am 7f4d8bed: am 425587d2: Merge "Use va_list argument to abort transaction"

* commit '7f4d8bed20a035cc334db46febc51e8ba8b693aa':
  Use va_list argument to abort transaction