tree 336491803eeb0d2ff18ba0064014ab4e6910c19e
parent 6538dd88bb03fe3ba51acaa90db750b57269f4d3
parent 58b193adcd9f0eef290ecbca9a30657163e856ec
author Marco Nelissen <marcone@google.com> 1364486258 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364486258 -0700

am d6a6bf3f: Merge "Fix valgrind error." into jb-mr2-dev

* commit 'd6a6bf3f29bfa86a02e33eabf041e6ec136308af':
  Fix valgrind error.