| commit | 2a0451e54a3c3b397861736c42e42125bd938d43 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Mon Jun 17 18:11:34 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 17 18:11:34 2013 +0000 |
| tree | c8713e9605f2c2a796f2ed0c1d1a01acf5f09bdd | |
| parent | 4aaf8b3d4b160aea5ceb5ccf799e44c1d5a3f14b [diff] | |
| parent | a02c4ed885d97e516f844ddb0a96083f1b45b4cb [diff] |
Merge "Fix clip merging behavior"