[automerger skipped] [SF] Make sure destination clip is contained in display...
[automerger skipped] [SF] Make sure destination clip is contained in display bounds am: c7f9e4ee am: 2ed7884a am: 96ac046d am: 05735fcc -s ours
am skip reason: Change-Id Ia7b6ebd311c1b751c1966a34a9294b9b85a2aa0b with SHA-1 fcfe1360 is in history
Change-Id: I73a293f52cadc720c2b386721ef1f740719a087d