tree ca98d5c2c2bffa90937b0b486e032f8f1ca7bb4f
parent e6a5d22b421060d441674a5717c3adc23b3a7d27
parent 1ca7d06313b1e0aa6883671d22a43273837d39be
author Winson Chung <winsonc@google.com> 1506541299 +0000
committer android-build-merger <android-build-merger@google.com> 1506541299 +0000

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

Change-Id: Ifd9843a433cadc7d0effa6783455e933ca5d2575