tree b4f0294127625179022a749ba03737ea0a5f0c79
parent ba1bed68ec8b96b31cc06790055517f229e85281
parent 4c6c82a2e856df8c3740b7d27c9b11d633716be2
author Jingning Han <jingning@google.com> 1455130461 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1455130461 +0000

Merge "Resolve conflict between var-tx and super-tx" into nextgenv2