tree b4b6ce37a06239492b31f00a30c46c2dac00c716
parent 9383c8cb0bb9625590a48418b212d4a79e451e7d
parent 3474ab2888838e512c6bcff588fa88f02c81135f
author Stephen Hines <srhines@google.com> 1345769620 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345769620 -0700

am 3474ab28: Merge "Add libm due to libpng dependency." into jb-mr1-dev

* commit '3474ab2888838e512c6bcff588fa88f02c81135f':
  Add libm due to libpng dependency.