| commit | 3b2ebfa3d1d08cd144c48fcd387612ee7defef01 | [log] [tgz] |
|---|---|---|
| author | Diego Perez <diegoperez@google.com> | Tue Jul 21 16:16:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 21 16:16:59 2015 +0000 |
| tree | 4764f4547f4d805b018589ea260ec0d04e71f3b1 | |
| parent | f2f29dc4add3943eb4f0b06a5c748b99664212da [diff] | |
| parent | 224dfca641fb02b4a4a47deeeda9d03036c613fa [diff] |
am 224dfca6: am c273c178: am 66e66831: Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev * commit '224dfca641fb02b4a4a47deeeda9d03036c613fa': Render to measured size when using expand mode