| commit | 29149309089f1e12467add02e499b833dc0502e3 | [log] [tgz] |
|---|---|---|
| author | Diego Perez <diegoperez@google.com> | Thu Aug 27 11:16:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:16:04 2015 +0000 |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | 603faf4944d26d0895d5fe008a4afa73361ccf27 [diff] | |
| parent | 27d036475b25559a5364f61e24ebc8fa7641e956 [diff] |
am 27d03647: (-s ours) am 11e0f661: am e76c916a: Merge "Only setting height to 1 when we are reducing the width" into studio-1.4-dev automerge: 3bc9319 automerge: f86bb57 * commit '27d036475b25559a5364f61e24ebc8fa7641e956':