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