Merge branch 'upstream' into tizen
authorYoungbok Shin <youngb.shin@samsung.com>
Mon, 22 Aug 2016 01:57:21 +0000 (10:57 +0900)
committerYoungbok Shin <youngb.shin@samsung.com>
Mon, 22 Aug 2016 01:57:21 +0000 (10:57 +0900)
commita0b6772c617e3db5858f6b6a45f3e2d3c6146a4f
tree8412962809a86d4fc85d62342dfdc97913703a2e
parentb2201aeb45f31a7a91cc0c2abb1bb42335366030
parent087e8c5d58be057cb77192932cd7fa8f7aacf1a5
Merge branch 'upstream' into tizen