tree aa64cb0d8fdfa739b69be8d02274953ecb860e17
parent d5358874e2cc90be3d7d3370ef7342c96c212451
parent a6dbfdd3a858aac52cc87f80f91e8eef7d613605
author Jeff Brown <jeffbrown@google.com> 1306359806 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306359806 -0700

am a6dbfdd3: Add a sprite controller. (DO NOT MERGE)

* commit 'a6dbfdd3a858aac52cc87f80f91e8eef7d613605':
  Add a sprite controller. (DO NOT MERGE)