tree 06fa9b5b26f76397a14d01b17118cf52b249eb8e
parent e9c2f18c8ec9c5a09fce0d48a71bb2ce93ca75c4
parent 8025061c594e5171e1bf370d8fdd77e0e9a02b47
author Chet Haase <chet@google.com> 1345066836 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1345066836 -0700

Merge "Restore scissor state correctly" into jb-mr1-dev