tree 63d34095f45ae0d9eb850cfc1df227c2a126f1ba
parent b4cf4d7d94c54a9fc49329aa891144f87f53602e
parent a527c07b8d078f7da1114b7055f65b479a148729
author Jesse Hall <jessehall@google.com> 1427230791 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427230791 +0000

am a527c07b: Merge "Fix mistake using width instead of height."

* commit 'a527c07b8d078f7da1114b7055f65b479a148729':
  Fix mistake using width instead of height.