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