| commit | ce52107cddf85fe0095f973b6f3cc9e62a190d68 | [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 | 36e59a48ce3dffa16c0541209104ce6e1b2449fe | |
| parent | 55db92c10181f8f76540f79592d66b945b7df260 [diff] | |
| parent | 361d66c7af8a634baed13bb395aeb78c99b7903b [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