OSDN Git Service

am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fontFamily...
authorRaph Levien <raph@google.com>
Thu, 29 Jan 2015 22:38:41 +0000 (22:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jan 2015 22:38:41 +0000 (22:38 +0000)
automerge: 35b5780

* commit '35b5780ec52f3492ae41c36ae30e289bcf78cb11':
  Refine resolution order for typeface and fontFamily

1  2 
core/java/android/widget/TextView.java