tree 6fc1d3bbc1a6f7cf7c07ffa94cd8d0146ed0c599
parent a11ac26b0e012eb9b9829afc74095a5cc6292452
parent 92ade49ecaa23cd77510ee0bc1dbc6355eb581ed
author Griff Hazen <griff@google.com> 1392054897 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392054897 +0000

am 92ade49e: Merge "Fix ActivityView layout bug." into klp-modular-dev

* commit '92ade49ecaa23cd77510ee0bc1dbc6355eb581ed':
  Fix ActivityView layout bug.