Merge branch 'master', remote-tracking branch 'origin/tizen'
authorEunji, Lee <eunjieji.lee@samsung.com>
Fri, 11 Sep 2015 00:55:09 +0000 (09:55 +0900)
committerEunji, Lee <eunjieji.lee@samsung.com>
Fri, 11 Sep 2015 00:55:09 +0000 (09:55 +0900)
commit92d99b7bfe2ae9219ad1a2f99468045c52c82fb8
tree81df20da628e21870d0966c0a85dd72e8042a187
parent1e203e5c23d353b2f9f3691989a32b5172041da1
parent3b8d61248c2a6a471ce6239ab839ec5888005020
Merge branch 'master', remote-tracking branch 'origin/tizen'