am 168585ed: am 5474902f: Merge "xhdpi" into froyo