tree 2500afc426ddbab6ac0ad10accb0cd10e60cba32
parent 67ac7f204a45f91541cae0ccfc8b410c7fac1e60
parent 469b73f987031754590abf97c552efbde781c097
author Ben Murdoch <benm@google.com> 1380138983 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380138983 -0700

am 469b73f9: Merge "Don\'t use WRAP_CONTENTS in testZoom." into klp-dev

* commit '469b73f987031754590abf97c552efbde781c097':
  Don't use WRAP_CONTENTS in testZoom.