summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge "Fix issues that will be present in C++11" into lmp-mr1-devAdam Lesinski2014-11-034-56/+44
| |\ \ \ \ \
| | * | | | | Fix issues that will be present in C++11Adam Lesinski2014-11-034-56/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - char16_t is a distinct type, so stay consistent with it throughout the code base. - char16_t is defined as minimum size of 16 bits. Since we mmap and cast data structures onto raw memory, we need a precise definition (uint16_t), so we cast between that (and static_assert that they are the same size). Change-Id: I869c32637543bbcfb39d2643e7d9df10d33acd3c
* | | | | | | am 541641d0: Merge "Fix counting" into lmp-mr1-devJohn Reck2014-11-031-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 5c8d135 * commit '5c8d135920896af42de8d8b91975abe3fa871cd9': Fix counting
| * | | | | | Fix countingJohn Reck2014-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a3568908a7223d69430c1765fb5a4db96d7ac9c
* | | | | | | am a8d83d63: Merge "Layer changes" into lmp-mr1-devJohn Reck2014-10-3125-187/+161
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: a51fba0 * commit 'a51fba0bf037844bcb911e69e8af733e6d2cccf6': Layer changes
| * | | | | | Merge "Layer changes" into lmp-mr1-devJohn Reck2014-10-3125-187/+161
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Layer changesJohn Reck2014-10-3125-187/+161
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17208461 * Switch Layer to be VirtualLightRefBase instead of Caches' side-channel ref-counting * Include active layers in gfxinfo dump * Run gfxinfo dump on the correct thread * Dump gfxinfo on Layer creation failure Change-Id: I28d195699e2334518e215ab28c7a17355aee9678
* | | | | | am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null ↵Alan Viverette2014-10-311-1/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values in resources" into lmp-mr1-dev * commit '3c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3': Distinguish unspecified and explicit null values in resources
| * | | | | Distinguish unspecified and explicit null values in resourcesAlan Viverette2014-10-291-1/+15
| |/ / / / | | | | | | | | | | | | | | | | | | | | BUG: 17919345 Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
* | | | | am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-devJohn Reck2014-10-301-5/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: a27e1a3 * commit 'a27e1a366a2d83165e71b68669fbd21ced6a4b08': Be more conservative about current buffer
| * | | | Merge "Be more conservative about current buffer" into lmp-mr1-devJohn Reck2014-10-291-5/+4
| |\ \ \ \
| | * | | | Be more conservative about current bufferJohn Reck2014-10-271-5/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 18065565 Change-Id: I0b9c85ecf384ebe525e3a38803ab77d7ee37f33a
* | | | | am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-masterNarayan Kamath2014-10-292-1/+9
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '4ed472ab33e78391c0b084ed3908019e06b7dfe5': Suppress Clang compilation warnings.
| * | | | resolved conflicts for merge of 3028394c to stage-aosp-masterNarayan Kamath2014-10-292-1/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6
| | * | | | Suppress Clang compilation warnings.Chih-Hung Hsieh2014-10-246-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore warnings about unused parameters and initialization of static constant float data members. Change one potential error of allocating variable length array of non-POD element type on stack. Fix mismatch of class and struct declaration tags. BUG: 17512760 Change-Id: I3a09c945fb1c17f27aff74a7e439dd4c35d1fb32
| * | | | | Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-masterBill Yi2014-10-22204-6025/+26993
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43
| | * | | | am aeef612f: Merge "Search all packages for a given type string when looking ↵Adam Lesinski2014-10-092-43/+60
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | up resources by name" into lmp-dev * commit 'aeef612f200b6b5cee214230271e1c3d718151ee': Search all packages for a given type string when looking up resources by name
| | * \ \ \ \ am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-devJohn Reck2014-10-036-41/+36
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd988a45d60cd2ff05e41a44c78cb09d307bd90cb': Cleanup DeferredLayerUpdater
| | * \ \ \ \ \ am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into ↵ztenghui2014-10-011-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'f903304896809039430c5e52bd0c24052f51b14f': + correcting shadow visual appearance (b/17610926)
| | * \ \ \ \ \ \ am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a ↵Adam Powell2014-10-011-5/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shared lib"" into lmp-dev * commit 'c6a06d437cf2ee7926a01b2f8ee685555bfb3d81': Revert "Fix issue with using locally defined attrs in a shared lib"
| | * \ \ \ \ \ \ \ am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared ↵Adam Lesinski2014-10-011-1/+5
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lib" into lmp-dev * commit 'cd8e73817d14798f9d2031ffd301a03a096b7907': Fix issue with using locally defined attrs in a shared lib
| | * \ \ \ \ \ \ \ \ am fd0a1df1: am 737dfe57: Merge "Reject transparent draws more ↵Chris Craik2014-09-231-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conservatively" into lmp-dev * commit 'fd0a1df16fba712fb569eb637d960a7e78e3e62c': Reject transparent draws more conservatively
| | * \ \ \ \ \ \ \ \ \ am 91a40be0: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-devChris Craik2014-09-191-1/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '91a40be04f8d1822c27888cc47124bf965633f4f': Account for alpha in hasShadow()
| | * \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aospDan Albert2014-09-192-3/+6
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c
| | * | | | | | | | | | | resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aospDan Albert2014-09-191-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d0f81003f84d03a7a67420dd496fde18dd654d4
| | * \ \ \ \ \ \ \ \ \ \ \ am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT ↵Adam Lesinski2014-09-192-1/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public attrs" into lmp-dev * commit '8bdb265f0a73bc6f2114ca70f141c214a23696c7': Fix backwards compat problem with AAPT public attrs
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 923ccf24: am 340ccfe0: Merge "glFinish to flush deletes" into lmp-devJohn Reck2014-09-191-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '923ccf247415587a23e7be40eacf4cdb7b4f1503': glFinish to flush deletes
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 658a7846: am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" ↵Chris Craik2014-09-194-2/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '658a7846cac4235653fe264c09182302262971ae': Fix garbage showing up beneath dialogs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a19867e1: am fd340229: Merge "Special case EGL_BAD_SURFACE" into lmp-devJohn Reck2014-09-173-6/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a19867e1b279239579a88002c86b63cdb2ad8a58': Special case EGL_BAD_SURFACE
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d0738f9c: am 8523ad90: Merge "Change default fbo cache size to 0" into ↵John Reck2014-09-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'd0738f9c1e049ebd881ea9c5fb93076e0aeb81cc': Change default fbo cache size to 0
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am befbdaba: am b5a27aee: Merge "Handle premultiplication correctly for ↵Chris Craik2014-09-172-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ColorMatrixColorFilters" into lmp-dev * commit 'befbdaba72a2c1502ff6135a8214f7434a6b2ea7': Handle premultiplication correctly for ColorMatrixColorFilters
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d2420d39: am ac980443: Merge "Use RenderThread for navigation bar ↵Jorim Jaggi2014-09-163-0/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ripples" into lmp-dev * commit 'd2420d39c03c17ec62b283e5a99c33ff1360926f': Use RenderThread for navigation bar ripples
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4dae506c: am e27790db: Merge "Force isolation of clip and matrix within ↵Chris Craik2014-09-152-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layer" into lmp-dev * commit '4dae506c27327a3ddced29fc15880c86abe3a3a5': Force isolation of clip and matrix within layer
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 31b76b66: Merge "libandroidfw: Do not build device library when building ↵Adam Lesinski2014-10-281-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK" into lmp-mr1-dev automerge: 06caf1b * commit '06caf1b1112a6a3e364a46d02b883451e9180a07': libandroidfw: Do not build device library when building SDK
| * | | | | | | | | | | | | | | | | | | | | Merge "libandroidfw: Do not build device library when building SDK" into ↵Adam Lesinski2014-10-281-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | | | | | | | | | | | | | | | | | | libandroidfw: Do not build device library when building SDKAdam Lesinski2014-10-241-0/+3
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building the windows SDK causes a build failure if the device libandroidfw target is not omitted. Change-Id: I587b166342d0d047820911d279f192d2b39b6263
* | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaadJohn Reck2014-10-289-93/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 49a01fc * commit '49a01fc7dc8d2b9cc7591a94d19f3c209e470aea': Cleanup debug options
| * | | | | | | | | | | | | | | | | | | | | Cleanup debug optionsJohn Reck2014-10-279-93/+58
| |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18138852 Bug: 18065434 Change-Id: Ibb07b73b147c2a8b287fe8aee3f6624582f21b00
* | | | | | | | | | | | | | | | | | | | | am 879f237a: Merge "Added some more Split density tests" into lmp-mr1-devAdam Lesinski2014-10-2436-157/+803
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 93b43445 * commit '93b434451abd11ff58ada66abdcddb3f33bb5023': Added some more Split density tests
| * | | | | | | | | | | | | | | | | | | | Merge "Added some more Split density tests" into lmp-mr1-devAdam Lesinski2014-10-2336-157/+803
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | Added some more Split density testsAdam Lesinski2014-10-2336-157/+803
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b83515f1240e713bbcff5385cf054bba693f297
* | | | | | | | | | | | | | | | | | | | | | am 82572cc4: am badac04d: Merge "Add some free zoom to lockHardwareCanvas" ↵John Reck2014-10-236-27/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '82572cc458053e8cec292a708e18d0de7cfbead2': Add some free zoom to lockHardwareCanvas
| * | | | | | | | | | | | | | | | | | | | | Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-devJohn Reck2014-10-236-27/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Add some free zoom to lockHardwareCanvasJohn Reck2014-10-236-27/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18099195 Don't use EGL_SWAP_BUFFER_PRESERVED on surfaces that will never benefit. Also clean up some confusing naming Change-Id: I674ca64e0464a3282cff79e5ecd350d08f47c014
* | | | | | | | | | | | | | | | | | | | | | | am ebcfd24b: am 68335df6: Merge "Fix damage bug" into lmp-mr1-devJohn Reck2014-10-231-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ebcfd24b8f1fc8e000a08c0bbce3a4215083ae8a': Fix damage bug
| * | | | | | | | | | | | | | | | | | | | | | Fix damage bugJohn Reck2014-10-221-0/+3
| |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18087374 Change-Id: Ie183392122c73f93010fb3f4be071c924b352966
* | | | | | | | | | | | | | | | | | | | | | am 733bb3bc: Merge "Fix memory corruption in test" into lmp-mr1-devJohn Reck2014-10-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: a91c5ca * commit 'a91c5ca78a0e9b24445126895a0070d399506849': Fix memory corruption in test
| * | | | | | | | | | | | | | | | | | | | | Merge "Fix memory corruption in test" into lmp-mr1-devJohn Reck2014-10-221-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Fix memory corruption in testJohn Reck2014-10-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18012918 Change-Id: I8d69624e9be9f0399ddba10ce3903f93177d5930
* | | | | | | | | | | | | | | | | | | | | | am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-devJohn Reck2014-10-212-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e73a54f33c029552469fcf1cda46eed2f360a38e': Surface:lockHardwareCanvas