From: Hyunjin Park <hj.na.park@samsung.com>
Date: Wed, 13 Jan 2016 08:40:27 +0000 (+0900)
Subject: Merge branch 'master' into tizen
X-Git-Tag: submit/tizen/20160202.080640~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2314154818d137e04a4d4e5a2f834ca6b39f35ec;p=platform%2Fcore%2Fapi%2Fcordova-plugins.git

Merge branch 'master' into tizen
---

2314154818d137e04a4d4e5a2f834ca6b39f35ec