OSDN Git Service

Merge "Stop loading other package's font by default." into oc-dev am: 824d75e0e1...
authorSeigo Nonaka <nona@google.com>
Fri, 23 Jun 2017 12:35:19 +0000 (12:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 12:35:19 +0000 (12:35 +0000)
am: 2629b0c1a0  -s ours

Change-Id: Ie753fcbec56aab3a6718140a71a0d7e44e4a23dd


Trivial merge