Merge "Fix SntpClient to give accurate time info." into froyo