tree 7f17abfbd0b95e54e4e38037f5f41dc387633b1d
parent d1fa69d3d1baa85e39b7ac30e266656b2c41cb0d
parent 3dfc1ab1aa4d88f582963bda2dc8a49b7c739a3a
author Joe Onorato <joeo@google.com> 1295482264 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1295482264 -0800

Merge changes I3814b491,Ic3a7f4c0 into honeycomb

* changes:
  Pass SkRegion::toString() through to java.
  Remove optimization to isInContentArea that wasn't working.