tree f33bda960888ff77df2f044a768796106f4a378e
parent 029498f856683af920817f8d806744f1ea124165
parent 176f2533a1768755e965b242333dac93ae17d26b
author Mady Mellor <madym@google.com> 1498694003 +0000
committer android-build-merger <android-build-merger@google.com> 1498694003 +0000

Merge "Adjustments to PIP position while flinging" into oc-dr1-dev
am: 176f2533a1

Change-Id: Ic5d38c862c155ac025884e53d688826b57829529