tree 63716bef06e7654fe8af18140d5135043d293c71
parent c52e5656adae84b9be8d0e10f0e68bfca988fe9a
parent c25e44371cee46d5ba925ef59b9af726cbbc6480
author John Reck <jreck@google.com> 1323811000 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1323811000 -0800

Merge "Revert "Put canvas on a layer"" into ics-mr1