tree bc6b526ce24edefb2fb4851f361f78f81e244a7a
parent 040d07bff5c8e093d08527c79a81397b293c0b8a
parent c999d3f2355cf57cd59f2d1a991c009f45342135
author Mathias Agopian <mathias@google.com> 1254694472 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254694472 -0700

am 4ac45597: Merge change I15b0ebb9 into eclair

Merge commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-mr2

* commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
  a simple test app for gralloc