tree 4885829af30fe5d05f6df76813537b18d6a3657c
parent 8c268801f8b3075b97c40cd128dd7bebd7d35ad0
parent 6ed77c130d80fe607ec91ada4cf5718d512b4ad5
author Mark Salyzyn <salyzyn@google.com> 1401486660 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401486660 +0000

am 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"

* commit '6ed77c130d80fe607ec91ada4cf5718d512b4ad5':
  libcpustats: Turn on -Werror