Merge "Re-order draw methods to make update-api happy"

This commit is contained in:
TreeHugger Robot
2016-10-20 18:49:00 +00:00
committed by Android (Google) Code Review

File diff suppressed because it is too large Load Diff