| commit | 5e0ac8774f8814b4cf98b3abde6c11f02f3ab047 | [log] [tgz] |
|---|---|---|
| author | Diego Perez <diegoperez@google.com> | Tue Jul 21 15:50:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 21 15:50:59 2015 +0000 |
| tree | 0e66d0f72ddb9620124fd214a02edfc707624ef8 | |
| parent | 95b37306c051c7736d3cdbe1247f0b6f2c0be749 [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