Merge "Setting : modify Process Activity template (add Memory allocation feature...
authorwoojin Jung <woojin2.jung@samsung.com>
Fri, 25 Sep 2015 03:55:56 +0000 (12:55 +0900)
committerGerrit Code Review <gerrit@tizensrc>
Fri, 25 Sep 2015 03:55:56 +0000 (12:55 +0900)

Trivial merge