tree 07a99dcb8fb1c21b0995f991f479859f25f39bd8
parent acdbbdcecb6e09b8fc4372cf4b9db69823aec31e
parent 884e3bc29ed190a856f7562a73548868a7ecef2f
author Jamie Gennis <jgennis@google.com> 1355191174 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355191174 -0800

am 884e3bc2: (-s ours) am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees

* commit '884e3bc29ed190a856f7562a73548868a7ecef2f':
  [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees