tree 79b6a76382f7e3b1fc5ff123c4e6df835f04f407
parent 9043202b5bb8e0725b0302e9da9d3a57c837e798
parent 0b4a85bf1e11e28f66d0f101f9e7d4c51a0bb31c
author Elliott Hughes <enh@google.com> 1362591716 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362591716 -0800

am 0b4a85bf: Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"

* commit '0b4a85bf1e11e28f66d0f101f9e7d4c51a0bb31c':
  Fix TIMING/STATS/COUNT_PAGES dynamic linker build