Merge "[CTC][platform-permission][NONACR][NFC module test tpk added]" into tizen_3.0
authorJihun Park <jihun87.park@samsung.com>
Tue, 14 Jun 2016 07:08:24 +0000 (00:08 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 14 Jun 2016 07:08:24 +0000 (00:08 -0700)

Trivial merge