| commit | d3f9ffe28d1599e40f8c9a7c0c32465324bb2828 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Thu Apr 18 20:43:24 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 18 20:43:25 2013 +0000 |
| tree | a621c588f0003849c1696c35f07e3a973fc54abe | |
| parent | 5d1a182a8a2dd9613ef3b1f2de7b6a3d690ae890 [diff] | |
| parent | ee5b2c6de7fb32d945a5a1303012a5f94b719dfa [diff] |
Merge "Prevent transformed ops from merging in the first place" into jb-mr2-dev