Merge "evdi: evdi, sensor and nfc driver added" into develop
authorDaiYoung Kim <daiyoung777.kim@samsung.com>
Fri, 26 Jul 2013 12:18:46 +0000 (21:18 +0900)
committerGerrit Code Review <gerrit2@system.s-core.co.kr>
Fri, 26 Jul 2013 12:18:46 +0000 (21:18 +0900)

Trivial merge