| commit | 4e62783688236f3b495b97f02a2625e93b7b8d72 | [log] [tgz] |
|---|---|---|
| author | Martin Kosiba <mkosiba@google.com> | Tue Dec 10 01:50:02 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 01:50:02 2013 +0000 |
| tree | 561ccc2f85b1b6f91a556d651fe6d5320d3ef3db | |
| parent | b71e73568439160b7358130dab8fafa4fe1069a3 [diff] | |
| parent | ce3ae6a641de67fb482dd77e7f3ed8039e47a88e [diff] |
am ce3ae6a6: (-s ours) am e38e0d9c: Merge "Set a fixed layout size only if the container view has a WRAP_CONTENT layout mode." into klp-dev * commit 'ce3ae6a641de67fb482dd77e7f3ed8039e47a88e':