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