am 36f38f4e: am 9907a109: Merge "Fix screen magnifier scaling due to...
am 36f38f4e: am 9907a109: Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev
* commit '36f38f4e':
Fix screen magnifier scaling due to ScaleGestureDetector changes.