tree 731cb57316cd7a545c488a5029522ae459bba7d6
parent df20aed9f78c4572d403f7d5e1ad7cf10f41d94e
parent e70f79b5847b92cd2cb0dd3dd7ef6c3690d341d9
author Jaewan Kim <jaewan@google.com> 1473201328 +0000
committer android-build-merger <android-build-merger@google.com> 1473201328 +0000

Merge "Keep the PIP at the shifted position when the Settings is shown" into nyc-mr1-dev
am: e70f79b584

Change-Id: Ib0c7423c21cd50ab3074357a20d13516c9b287a4