tree 8425206ef0b77397c6b4b1cf185375ec4b694e74
parent 1a738594899bc0abb34f3255d111683de607e6cb
parent edb555edceaf51f7ef40e35257a4b00c06a68e72
author Griff Hazen <griff@google.com> 1392055287 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392055287 +0000

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

* commit 'edb555edceaf51f7ef40e35257a4b00c06a68e72':
  Fix ActivityView layout bug.