Lynix 12968c73fe Merge branch 'master' into application ... Former-commit-id: 02d073ae79490d0ac38e56c90bf7d8ff57ae94c4		2016-03-29 21:47:56 +02:00
..
NDK	Merge branch 'master' into application	2016-03-29 21:47:56 +02:00