| commit | bb451bda4a08f79b60f84242647bdb40962f01b5 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Fri Sep 13 17:22:27 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 13 17:22:27 2013 -0700 |
| tree | eafc737c5d0b595097c5e0b87235cbeda1545ba6 | |
| parent | 5de041193cec58e8ee40a62c760b24141455b2f8 [diff] | |
| parent | 0d3c52d3afc1e3ea4ae2ea63355388a095ebeb4c [diff] |
am 0d3c52d3: Merge "Fix merged operation clipping" into klp-dev * commit '0d3c52d3afc1e3ea4ae2ea63355388a095ebeb4c': Fix merged operation clipping