resolved conflicts for merge of 5407d5c3 to ub-deskclock-charm
resolved conflicts for merge of 5407d5c3 to ub-deskclock-charm

Change-Id: I069373d9859bc3f7dea5a9e3f1a939e6bdc6753a

OrBin/SynClock-Android