| commit | 1919e415b11a9c3cf23b08a55aebaa77c936a398 | [log] [tgz] |
|---|---|---|
| author | Ben Murdoch <benm@google.com> | Wed Sep 25 12:58:43 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 25 12:58:43 2013 -0700 |
| tree | 7fed0194db888ab5cd41fdc5fceb14dbab24c9aa | |
| parent | 0691fd00fcf30e4e9f7cd58d48a52138201332ea [diff] | |
| parent | bae7cc0e50c1e711934dc525324c969dfa6b7cb6 [diff] |
am bae7cc0e: am 469b73f9: Merge "Don\'t use WRAP_CONTENTS in testZoom." into klp-dev * commit 'bae7cc0e50c1e711934dc525324c969dfa6b7cb6': Don't use WRAP_CONTENTS in testZoom.