tree dca09d4d9647dc95b1d22f88eaa5fe9097e33e09
parent 193b0cf46d0c3a4bc37acc76d4bd250d7ab1a142
parent 68c02e25e84e9814d313b43680631b98e25fa6d5
author Romain Guy <romainguy@google.com> 1328663348 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328663348 -0800

am 68c02e25: Merge "Preliminary support for clipRect(Rect, Op)"

* commit '68c02e25e84e9814d313b43680631b98e25fa6d5':
  Preliminary support for clipRect(Rect, Op)