Handle conflicts from git merge release-20160531 release-20160615 release-20160930
authorSoonKyu Park <sk7.park@samsung.com>
Thu, 16 Jun 2016 08:32:15 +0000 (17:32 +0900)
committerSoonKyu Park <sk7.park@samsung.com>
Thu, 16 Jun 2016 08:32:15 +0000 (17:32 +0900)
commit06e10c8b1f4f355e884d52a61b7762e733975d55
treed16f1113bd5460842228e1b7e75ff38deb438163
parent8e7c90b9ae69aad55495a8f5be4e94b498052166
parent7d042a8203461117e8743bf1e879af431d3c31cd
Handle conflicts from git merge release-20160531

Change-Id: I1cae90068ab2576d756188e36e112550c7c293de