am b7d40df0: (-s ours) am c68728f5: am b059ff81: am 2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
* commit 'b7d40df088b0dd83152361efc6d25fb32afc6234': Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
This commit is contained in: