diff options
| author | Chan Lee <chan45.lee@samsung.com> | 2017-10-25 21:06:32 +0900 |
|---|---|---|
| committer | Chan Lee <chan45.lee@samsung.com> | 2017-10-25 21:06:32 +0900 |
| commit | a89b0e9415e8c9eae13d7858e38b5a487cc41814 (patch) | |
| tree | 188d5ebbddf15c112e4ffa98e45e0bcaf7e0e9d6 | |
| parent | 9fd30c23f662611da750de8d35a26e6fd9fc676a (diff) | |
| parent | 4ec9fc3c9b12d0186bcbfa9daf3d3d2c2553c6cf (diff) | |
| download | swap-manager-sandbox/dkson95/hardfp.tar.gz swap-manager-sandbox/dkson95/hardfp.tar.bz2 swap-manager-sandbox/dkson95/hardfp.zip | |
Merge branch 'sandbox/dkson95/hardfp' of ssh://review.tizen.org:29418/platform/core/system/swap-manager into sandbox/dkson95/hardfpsandbox/dkson95/hardfp
Conflicts:
ui_viewer/Makefile
Change-Id: I58b4f627d900c06ef7e72279f77b120fbb4aa754
0 files changed, 0 insertions, 0 deletions