[automerger skipped] Merge "Fix unreadable clock" into qt-dev
am:c442c8e5f5-s ours am skip reason: change_id I64ee2dee14322b2c02891c3ffe5fc0b25d1f100b with SHA189233c49aais in history Change-Id: I5f13b7856f17f5e660e83599f1eedf901003834b
This commit is contained in: