| commit | bae7cc0e50c1e711934dc525324c969dfa6b7cb6 | [log] [tgz] |
|---|---|---|
| author | Ben Murdoch <benm@google.com> | Wed Sep 25 12:56:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 25 12:56:23 2013 -0700 |
| tree | 2500afc426ddbab6ac0ad10accb0cd10e60cba32 | |
| parent | 67ac7f204a45f91541cae0ccfc8b410c7fac1e60 [diff] | |
| parent | 469b73f987031754590abf97c552efbde781c097 [diff] |
am 469b73f9: Merge "Don\'t use WRAP_CONTENTS in testZoom." into klp-dev * commit '469b73f987031754590abf97c552efbde781c097': Don't use WRAP_CONTENTS in testZoom.