tree d27fb1e51083104055bae54ccef571e843d0c037
parent 77fc8b8066709a1d09a159901fd65c49b5e6eaa5
parent 74c48f2b2b7084e1bfddb2dddf7587b0cf821ea6
author Dianne Hackborn <hackbod@google.com> 1308076929 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308076929 -0700

am 74c48f2b: am 700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2

* commit '74c48f2b2b7084e1bfddb2dddf7587b0cf821ea6':
  Update resources documentation with new qualifiers.