tree 44b15995bdcfb49d993cff37f6ed4dddf35c3007
parent 9d995d67217e44e022c9e5d0767634fa81f87b78
parent 7bc49fcfc0de8ce6f386f362cdab6902e6bbe7b4
author Elliott Hughes <enh@google.com> 1359511766 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359511766 -0800

am 7bc49fcf: am 323287ea: Merge "Fix valgrind build."

# Via Android Git Automerger (1) and others
* commit '7bc49fcfc0de8ce6f386f362cdab6902e6bbe7b4':
  Fix valgrind build.