diff options
| author | Diego Perez <diegoperez@google.com> | 2015-08-27 22:00:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 22:00:03 +0000 |
| commit | 623f650cc7e4f507f836e84d2ecda260164ea179 (patch) | |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | e13b9d3824fa075053098a6cacd0d4acac94a8d1 (diff) | |
| parent | 29149309089f1e12467add02e499b833dc0502e3 (diff) | |
| download | idea-623f650cc7e4f507f836e84d2ecda260164ea179.tar.gz | |
am 29149309: 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 '29149309089f1e12467add02e499b833dc0502e3':
0 files changed, 0 insertions, 0 deletions