am 1baae5c9: (-s ours) am 36b077d5: Merge "Eliminate some accidental log spam.  (DO NOT MERGE)" into honeycomb-mr1

* commit '1baae5c9b635f8672a8f0b8d83f23d5b9ec72297':
  Eliminate some accidental log spam.  (DO NOT MERGE)