OSDN Git Service

Merge "Restricted Context layout font loading in TextView" into oc-dev am: 7f90a9fdb0
authorClara Bayarri <clarabayarri@google.com>
Sun, 30 Apr 2017 07:04:12 +0000 (07:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 30 Apr 2017 07:04:12 +0000 (07:04 +0000)
am: 8f21dc7811

Change-Id: I261f5fbbf233bf332a4e33c38f7a9a379d5ca00c


Trivial merge