tree 80d147af04db7470d673f304372db18b92cdd289
parent 82fd842827fcdb3570d0c606bd049f42bf2b3fba
parent 1125d1fa92ab9f3b8315bbfb72e038b62dfd454b
author John Reck <jreck@google.com> 1414101565 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414101566 +0000

Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev