tree 70d064d7f5257b3ed9ba2f0875b92baa60da16cc
parent a290b4b9121dab04c2989ab88017b8286075914b
parent c2a5b469a311891d8e3025aea0e4b348044dfaeb
author Jesse Hall <jessehall@google.com> 1427231216 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427231216 +0000

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

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