Merge pull request #7678 from dec1:tag_3.0.0
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 15 Nov 2016 19:35:38 +0000 (19:35 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 15 Nov 2016 19:35:38 +0000 (19:35 +0000)
1  2 
samples/android/CMakeLists.txt

Simple merge