| commit | a7c2fcea273acf39a0d17966109efeb6a622822c | [log] [tgz] |
|---|---|---|
| author | Chet Haase <chet@google.com> | Wed Aug 15 14:44:39 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 15 14:44:39 2012 -0700 |
| tree | 22055f4d144f84ea30d5fdfbc70a2fa384aaa6e1 | |
| parent | f3f8b8ef3f6b29df3a9c0b677515ee31186f8e9f [diff] | |
| parent | 2a17c989855e5f4d63b3c09176a4a7fa9a1b24da [diff] |
am 2a17c989: am 6b7d46b7: Merge "Restore scissor state correctly" into jb-mr1-dev * commit '2a17c989855e5f4d63b3c09176a4a7fa9a1b24da': Restore scissor state correctly