| commit | d3979bc5a7fc45d14fdbc24c64ad798eee8b68af | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Fri Sep 13 17:32:06 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 13 17:32:06 2013 -0700 |
| tree | 7c0ff9ce6bd0357f255d7432cd7a77aa135ca2e4 | |
| parent | c083cb719a51db79a4ffdf194e2b9ca35c2846bb [diff] | |
| parent | bb451bda4a08f79b60f84242647bdb40962f01b5 [diff] |
am bb451bda: am 0d3c52d3: Merge "Fix merged operation clipping" into klp-dev * commit 'bb451bda4a08f79b60f84242647bdb40962f01b5': Fix merged operation clipping