tree e1e7cae779d6f28c59a9916f39276188e2b994b1
parent f3c9039800686eba252134998e66b7b5092c6103
parent f1eab210cc9a366af537b4bc173cac7d24ab2d13
author Scott Main <smain@google.com> 1285272622 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285272622 -0700

am a2427797: am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo

Merge commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2'

* commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2':
  docs: add more info about state list drawable and onclick attribute to Button