tree 1c718dd23b5def86a636d5a558e5df6582830525
parent 069915cd1c81d4d32e04afb6914c23dc227da359
parent 7aff46195e9fd9750d1643b479d8a7a2cb10dca9
author Edward Savage-Jones <edward.savage-jones@sony.com> 1504126647 +0000
committer android-build-merger <android-build-merger@google.com> 1504126647 +0000

Merge "IllegalArgumentException in MagnificationGestureHandler"
am: 7aff46195e

Change-Id: I3822533c2d7d01c7d804cfd6ad914d36f5ef482f