tree 8f18eb115430e0ac71f935cdd10562310c8a395d
parent 23ecb2cc0bf4c36c72f4b890e9effce5094a2984
parent 7c00f81606de1880c3f28e54cea064c3b90da3e7
author Scott Main <smain@google.com> 1343253918 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343253918 -0700

am 7c00f816: am 2f5b61a7: Merge "docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch" into jb-dev

* commit '7c00f81606de1880c3f28e54cea064c3b90da3e7':
  docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch