Merge "disable motion, face and voice menu in screen lock type temporarily." into...
authorJing Yigang <yigang.jing@tizendev.org>
Tue, 28 Aug 2012 04:10:18 +0000 (13:10 +0900)
committerGerrit Code Review <gerrit2@localhost>
Tue, 28 Aug 2012 04:10:18 +0000 (13:10 +0900)

Trivial merge