Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp * commit '97c2d840a10813164d82571775a3566637d6c5de': fix some doc errors in the resources;
Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp * commit '97c2d840a10813164d82571775a3566637d6c5de': fix some doc errors in the resources;