Merge remote-tracking branch 'origin/develop' 89/117689/1
authorChulwoo Shin <cw1.shin@samsung.com>
Tue, 7 Mar 2017 06:17:54 +0000 (15:17 +0900)
committerChulwoo Shin <cw1.shin@samsung.com>
Tue, 7 Mar 2017 06:17:54 +0000 (15:17 +0900)
Change-Id: I3a47b78223538cec3ceaac2db79c9fda7b43c9f9


Trivial merge