am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread

Merge commit '0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp

* commit '0a69f597604254bc37721b135ab612eaacdd0cbd':
  Rub in a little 'ol log-b-gone.
tree: e2dbb1adc34e57ec6c4b0330ff51afc0339607f6
  1. core/
  2. services/