tree 22676c8d400f7550368c74ca6d19ad220a88c21d
parent 59551217428a9cfbe11f727d0b69246a291931b5
parent 2d783ce2f4b2e507bead0d723f0edcdf902dbd46
author Adam Cohen <adamcohen@google.com> 1396909977 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1396909978 +0000

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