tree 85f5222635ac299c05afa458d30d9d3d28cf6632
parent 89311db9e26355dca3ddef1e99403cc1eb93f46c
parent 766dc49c17dda977bf7b93a5fd8da41c0b737611
author Mathias Agopian <mathias@google.com> 1351812721 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1351812722 -0700

Merge "rework a bit how we scissor the display"