tree c2b84e651e1f6d7b860c4fca819872b5d68c89fb
parent bc91c5f8b175c20f7e63ee245bd70c7e7bba2ba5
parent 6d04712d15e4fe9b44b0d9accf073f5a7f1d334a
author Svetoslav Ganov <svetoslavganov@google.com> 1347318191 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347318191 -0700

Merge "Allow simultaneous scale and pan in magnified state." into jb-mr1-dev