Merge "Make Up calls to control consistent so they are called at the end by derived...
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Fri, 6 Jan 2017 14:16:46 +0000 (06:16 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 6 Jan 2017 14:16:46 +0000 (06:16 -0800)

Trivial merge