tree bae4823c3c8357c9b5b59482980a9e6561de3923
parent 1ff9989b099fa716fda9571da56ced253a613698
parent a912bd88ce8001c65d367d06cde1680bd344b9ce
author Mathieu Chartier <mathieuc@google.com> 1412550223 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412550223 +0000

am a912bd88: Merge "Fix RuntimeTest.freeMemory" into lmp-dev

* commit 'a912bd88ce8001c65d367d06cde1680bd344b9ce':
  Fix RuntimeTest.freeMemory