tree 279f200608fda96bd1f36a2d0421b0282edd46d7
parent ffa5d463c36e2127ff10a03ee49f0677567c02c1
parent 2af9f21c664d4579b5f51283a320a7d1fba13a75
author Scott Main <smain@google.com> 1321285563 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321285563 -0800

am 2af9f21c: am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0

* commit '2af9f21c664d4579b5f51283a320a7d1fba13a75':