tree 18975b20415ea38846aeb9be16c43630495dcc53
parent 7d5c89eb71f42419bf9846311e5765ff24c45b51
parent d63e27eed277485df45fa2a719b4878a8ec31215
author Andrew Flynn <flynn@google.com> 1338933745 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338933745 -0700

am d63e27ee: am e6d3361e: Merge "Don\'t set hard width/height for cling OK button." into jb-dev

* commit 'd63e27eed277485df45fa2a719b4878a8ec31215':
  Don't set hard width/height for cling OK button.