diff options
| author | 2014-04-30 12:17:24 +0000 | |
|---|---|---|
| committer | 2014-04-30 12:17:24 +0000 | |
| commit | 39c5e9f87670a8bc543a716ac994c8c85ac94cd5 (patch) | |
| tree | aaedb12aaccc159d74b7c4bb126d815a7ce4912b /libs/gui/SurfaceComposerClient.cpp | |
| parent | 791781bfb8cdcdf90e32968159603e2fe5098d94 (diff) | |
| parent | b009280d5acb85a7c7e51daf52a9834ba63a8ae7 (diff) | |
am b009280d: am e4f00b2a: (-s ours) Merge commit \'6d05ef2310bdc84811d5b0385b009ad11447a749\' into HEAD
* commit 'b009280d5acb85a7c7e51daf52a9834ba63a8ae7':
Diffstat (limited to 'libs/gui/SurfaceComposerClient.cpp')
0 files changed, 0 insertions, 0 deletions