tree c3b02fbaca3b929730203008aacb160fd991d88e
parent c014a7f1fb7adc69c8bd861861a0c2ad29af30ac
parent 4726b4e8dc4c8eae84ca16895b22dc6dc43f44f5
author Winson Chung <winsonc@google.com> 1506541807 +0000
committer android-build-merger <android-build-merger@google.com> 1506541807 +0000

Merge "Minimal change to ensure that position is last saved when docking." into oc-mr1-dev am: 1ca7d06313
am: 4726b4e8dc

Change-Id: I3264b0a59ab9ff1b4b1d9ac0e66236e83c1bacd6