tree be7a4da5f543ce4df7db85bba8a1e82809866e8b
parent 6e334a8634ed9f79856d4fb78f267ef7b9be6721
parent 764da398dc95239fab2822049eecb4423749b386
author Andy Huang <ath@google.com> 1352425992 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352425992 -0800

am 764da398: Merge "fix "show pictures" button state after the view is recycled" into jb-ub-mail

* commit '764da398dc95239fab2822049eecb4423749b386':
  fix "show pictures" button state after the view is recycled