| commit | 3c8bd0d3de0d8493bddebfc9ddc9a76a783682e7 | [log] [tgz] |
|---|---|---|
| author | Jingning Han <jingning@google.com> | Wed Feb 10 18:54:21 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Feb 10 18:54:21 2016 +0000 |
| tree | b4f0294127625179022a749ba03737ea0a5f0c79 | |
| parent | ba1bed68ec8b96b31cc06790055517f229e85281 [diff] | |
| parent | 4c6c82a2e856df8c3740b7d27c9b11d633716be2 [diff] |
Merge "Resolve conflict between var-tx and super-tx" into nextgenv2