Merge pull request #4004 from paroj:camera-api
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 21 Jul 2015 15:57:47 +0000 (15:57 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 21 Jul 2015 15:57:48 +0000 (15:57 +0000)

Trivial merge