am 96619f9f: Merge "Add some error-case logging." into gingerbread

Merge commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696' into gingerbread-plus-aosp

* commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696':
  Add some error-case logging.
tree: bfecdc51f48251e3652abd8b63c8c24c6f5af15a
  1. core/
  2. services/