am 7c8f44ae: am 36c2aa4a: Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev

* commit '7c8f44ae529ce32356d83e92c26d9ba62be3298c':
  Surface:lockHardwareCanvas DO NOT MERGE
This commit is contained in:
John Reck
2014-10-22 21:07:01 +00:00
committed by Android Git Automerger

Diff Content Not Available