| commit | 7c8f44ae529ce32356d83e92c26d9ba62be3298c | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Wed Oct 22 20:48:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 20:48:27 2014 +0000 |
| tree | 56a6e211764dea32417019f2e50bd923a9661b59 | |
| parent | 80d812b9b5cac86d74d8de6d72c83462c78087ba [diff] | |
| parent | 36c2aa4a6394047f02c4f236233b41d738ff56c1 [diff] |
am 36c2aa4a: Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev * commit '36c2aa4a6394047f02c4f236233b41d738ff56c1': Surface:lockHardwareCanvas DO NOT MERGE