tree 014d2c47149bcf2d1c4a8c200b0a14c817ace2dd
parent 6bdc40f158f01a53e4374bc0e8af9f63167ee112
author Debargha Mukherjee <debargha@google.com> 1499775739 -0700
committer Debargha Mukherjee <debargha@google.com> 1499783226 +0000

Fix conflict between globalmotion & frame scaling

Change-Id: I9fe592d6fc4bd2cffea8cbc5ac80138f28182ef8