Merge branch 'upstream' into tizen
authorYoungbok Shin <youngb.shin@samsung.com>
Thu, 23 Jun 2016 00:52:10 +0000 (09:52 +0900)
committerYoungbok Shin <youngb.shin@samsung.com>
Thu, 23 Jun 2016 00:52:10 +0000 (09:52 +0900)
commitd4ef10676308831471bc331ce4304fde67393821
treee6f8512856a786db2a3816420197d896097e1aa1
parentd96da0b6aa6593b118b22d59a242c4feb5ff4927
parentc93352a5fa892a505dc3d04a651f59f1545e8251
Merge branch 'upstream' into tizen