tree ee0ff29eeebb7f8b8ccf557c98bbaa2c47d11776
parent f556fb1861230d732c11dfb9fbf34a352cdabc81
parent 28c03cca9835957f6e304b18358243b184fa46f8
author Jesse Hall <jessehall@google.com> 1427232024 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427232024 +0000

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

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