tree 22676c8d400f7550368c74ca6d19ad220a88c21d
parent ec0d39dd596001a73a73ad0aa51c080123ddd0e9
parent 38e7a6af269b89e9b2c40f498a93bfa9f842f610
author Adam Cohen <adamcohen@google.com> 1396910393 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396910393 +0000

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

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