tree 3e926796fae6d2ed68042d0e12a9af8bd891347f
parent b2cfdf5465e6060dc6ba635ebf42a39830c9c897
parent 70ca8b8947b354a511595159ef54f159db00c3eb
author ekempin <ekempin@google.com> 1475073728 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1475073728 +0000

Merge changes I51f888f8,I751f63ac,Ie3097ae4

* changes:
  ChangeScreen: Update token when 'Diff Against' selection is changed
  ChangeScreen: Keep 'Auto Merge' selected when navigating to diff and back
  Refactor: Add a new class to represent an object that can be diffed