Merge "Rebase history" into tizen_base
authorMyoungJune Park <mj2004.park@samsung.com>
Thu, 2 Jun 2016 02:58:15 +0000 (19:58 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 2 Jun 2016 02:58:15 +0000 (19:58 -0700)

Trivial merge