am 1bdbb072: am cdf96f75: am 8b0047f8: Merge "Fix typo when parsing external platform version from Settings." into froyo