Merge remote-tracking branch 'toybox/master' into upstream upstream
authorHyejin Kim <hyejin0906.kim@samsung.com>
Wed, 12 Aug 2015 02:22:10 +0000 (11:22 +0900)
committerHyejin Kim <hyejin0906.kim@samsung.com>
Wed, 12 Aug 2015 02:22:10 +0000 (11:22 +0900)

Trivial merge