tree da5bc43aaea98072e946bc4c46c4e6fc4a24561d
parent 7ad991882ae427f057e9e9a4b137e2b03140da60
parent b8f3131893b85bb21aa43cfed867b42eb6301be6
author Mindy Pereira <mindyp@google.com> 1337049672 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337049672 -0700

am b8f31318: Merge "Calculator layout reworking to handle large text." into jb-dev

* commit 'b8f3131893b85bb21aa43cfed867b42eb6301be6':
  Calculator layout reworking to handle large text.