| commit | 98cb80d65929687dc553f53766f40b2fe7f82b5b | [log] [tgz] |
|---|---|---|
| author | Raph Levien <raph@google.com> | Thu Jan 29 22:38:41 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 29 22:38:41 2015 +0000 |
| tree | 4958ec70bfabfced6a9f1f6c1dfe0507c75c541a | |
| parent | 9f74b337b0fff087addf3d3f0792cd4321cf5198 [diff] | |
| parent | 35b5780ec52f3492ae41c36ae30e289bcf78cb11 [diff] |
am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev automerge: 35b5780 * commit '35b5780ec52f3492ae41c36ae30e289bcf78cb11': Refine resolution order for typeface and fontFamily