tree 056cdbf5a9980120644b77bc96340b24cbbb90be
parent ef9fd39d73877162ba200ef8b2000216133dab2e
parent 97c2d840a10813164d82571775a3566637d6c5de
author Scott Main <smain@google.com> 1280970326 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280970326 -0700

am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class

Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp

* commit '97c2d840a10813164d82571775a3566637d6c5de':
  fix some doc errors in the resources;