Merge branch 'master' into group-manager 75/5175/1
authorJihun Ha <jihun.ha@samsung.com>
Wed, 24 Feb 2016 09:02:12 +0000 (18:02 +0900)
committerJihun Ha <jihun.ha@samsung.com>
Wed, 24 Feb 2016 09:02:12 +0000 (18:02 +0900)
commit6c39110cd89220de04c7adfc7aaede1aceb2ca0f
tree4df667bdf6d9dbd5b641037936f311494a9e3e61
parenta5a11389a62bbd6f4295e393e46ecee64d6850f1
parentf1b10862b39077d84b15ba22855b7e9de07e37a5
Merge branch 'master' into group-manager

Change-Id: I0116d6c7867e20b04007f820d8b936ef30150223
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>