tree 4e367a371a302304a7dca3ffcd5c57c42fab3aea
parent ff4abb9e160ee9cf2b98c2f9fbb4af903ce869c7
parent b502f7fa8250ba1cb2c74726808155a9f347e606
author John Hoford <hoford@google.com> 1351033156 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351033156 -0700

am 67fefdb9: add support for black and white filters, add rotation API to tiny planet

* commit '67fefdb9b77644c955e1c0c5b1fcd51e2374f212':
  add support for black and white filters, add rotation API to tiny planet