am 042efd6c: am b9cdead4: Merge "Better dumpsys logs" into gingerbread

Merge commit '042efd6c9251064f09705882180d9ab18ce4e914'

* commit '042efd6c9251064f09705882180d9ab18ce4e914':
  Better dumpsys logs