am 36c2aa4a: Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
* commit '36c2aa4a6394047f02c4f236233b41d738ff56c1': Surface:lockHardwareCanvas DO NOT MERGE
This commit is contained in: