tree ac76b054dd2e2c2858f0e179c16b419f44247b89
parent 47ed949131ba9383a8328bc19b636c0864639c27
parent 77a1273964b1a9810e89ba4b7bc26805eb2a97c3
author Adam Powell <adamp@google.com> 1355816742 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355816742 -0800

am 77a12739: am 7dd2157e: am 2ebfee16: am 859a62ce: Merge "Enforce a maximum size for action button icons." into jb-mr1-dev

* commit '77a1273964b1a9810e89ba4b7bc26805eb2a97c3':