commit | 675a518d5aca3092bfdd438f3f40bfdc3640cb80 | [log] [tgz] |
---|---|---|
author | John Reck <jreck@google.com> | Thu Oct 23 22:23:10 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 22:23:10 2014 +0000 |
tree | d050d6e20ac7deb77aacdbbcf54c3eddbea7a8d4 | |
parent | 8bc1ad937b4e753edf7a62cb96dade0f4c4fe0a3 [diff] | |
parent | b64e4372bb60bdce75e2af7d0b94efe92d94ac6a [diff] |
am b64e4372: am 82572cc4: am badac04d: Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev * commit 'b64e4372bb60bdce75e2af7d0b94efe92d94ac6a': Add some free zoom to lockHardwareCanvas