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)
commit8f21dc7811b30747a4ec608a58c84cd97a055cf0
treecadc82579683e7eb3247db9c84884092e2a041b9
parent4ad7cb3347e05b954a0ad818fba717194c6a0b79
parent7f90a9fdb0e655a3c804442c045a0589df0ba80e
Merge "Restricted Context layout font loading in TextView" into oc-dev
am: 7f90a9fdb0

Change-Id: I32a8e9e627e0b78b22c87b11483e744486e16944