| commit | aa29e3473540fbd23d2854c27e2c0688ffd651fb | [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 | e2672ca547a68f4d9dff978e68de3e2fafbbc64e | |
| parent | 22b1759166a2b3715c78b6e584e3de226c9ca39a [diff] | |
| parent | b8da95dc19f30a1b7a47a008a837a0a9922e1f33 [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