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)
commitc1c0f23fd1f48091ea2db02e238d04134abbceac
tree23f2b6efeef16aa46dcb53346354e9b110178f8c
parentc0ee03fab284f48f578e83bf0b6564ddc2e18aab
parentb1842a4b8954cbc4d73d6a84bfb5d20bd697dd1e
Merge pull request #4004 from paroj:camera-api