| commit | 2a17c989855e5f4d63b3c09176a4a7fa9a1b24da | [log] [tgz] |
|---|---|---|
| author | Chet Haase <chet@google.com> | Wed Aug 15 14:42:51 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 15 14:42:51 2012 -0700 |
| tree | 06fa9b5b26f76397a14d01b17118cf52b249eb8e | |
| parent | 777e977c0f0980e4c954a5cae566cf1c33f2e6c9 [diff] | |
| parent | 6b7d46b78c1c5c1ce3e077c0eed41c730f1686b4 [diff] |
am 6b7d46b7: Merge "Restore scissor state correctly" into jb-mr1-dev * commit '6b7d46b78c1c5c1ce3e077c0eed41c730f1686b4': Restore scissor state correctly