tree 6092a656c5231870ea67743910454e67354d4be7
parent a60ad4a65339d2d8f4c7da19e93be6a565495d8c
parent 3a91e9061c985c156f1a5a17b2159bf9013629c8
author Hiroshi Yamauchi <yamauchi@google.com> 1386270202 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386270202 -0800

am 3a91e906: Merge "Fix a rosalloc check failure in a test."

* commit '3a91e9061c985c156f1a5a17b2159bf9013629c8':
  Fix a rosalloc check failure in a test.