tree 22676c8d400f7550368c74ca6d19ad220a88c21d
parent 757167c27ebe82f694db853fa6bf55220e03a64e
parent c4cf34dedb5fc21fce30924105729fa3dad6aa90
author Adam Cohen <adamcohen@google.com> 1396910169 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396910169 +0000

am c4cf34de: Merge "Fix pre sdk-18 compatibility (crash in dispatchDraw)" into ub-now-mister-ugly

* commit 'c4cf34dedb5fc21fce30924105729fa3dad6aa90':
  Fix pre sdk-18 compatibility (crash in dispatchDraw)