OSDN Git Service

am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API...
authorJohn Hoford <hoford@google.com>
Tue, 23 Oct 2012 23:01:24 +0000 (16:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Oct 2012 23:01:24 +0000 (16:01 -0700)
* commit '4b2c4ecbadda7d2f15f4eb933bfe917dfc63fbc8':
  add support for black and white filters, add rotation API to tiny planet


Trivial merge