Merge "Doc change: adjust compatibility doc." into froyo