| commit | b8da95dc19f30a1b7a47a008a837a0a9922e1f33 | [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 | cbcc19f512d92178b25da7ab9ce04eaaabc3ae16 | |
| parent | 5b92b90b549af5a5b1592893539a9d64c1419af1 [diff] | |
| parent | ce52107cddf85fe0095f973b6f3cc9e62a190d68 [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