OSDN Git Service

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

Change-Id: I32a8e9e627e0b78b22c87b11483e744486e16944


Trivial merge