tree 0c919194c090714877b2c62e25984e00b216d760
parent 817379ca661582c71ce457eac9b4026f02ccc84d
parent 24e0cd34aa41b76df540ab8e98c7d983e9fdf74c
author Jason Parks <jparks@google.com> 1279659881 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279659881 -0700

am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread

Merge commit '29e25bd3418b04e395119bf99abe92898830a796' into gingerbread-plus-aosp

* commit '29e25bd3418b04e395119bf99abe92898830a796':
  Only print out wake locks in the if the wakelock was held.