| commit | c273c178d70eda9858714d59118b05da7ffb5313 | [log] [tgz] |
|---|---|---|
| author | Diego Perez <diegoperez@google.com> | Tue Jul 21 15:50:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 21 15:50:11 2015 +0000 |
| tree | f3de3ca90720297d374e036f491866dfbf1d7c56 | |
| parent | 7dcad6a5d426e1a243e36cbd084c60bc8038c56b [diff] | |
| parent | 66e6683193f6a1d071710ea8a39b02f5129fc505 [diff] |
am 66e66831: Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev * commit '66e6683193f6a1d071710ea8a39b02f5129fc505': Render to measured size when using expand mode