tree e4b4f68bfd18734bd9a78a1ff2c0685915b59383
parent d74a51bd62878709b242b53cfbdbae4cfd309ee4
parent b3e92234fa8268f1a28bb2e28990b3a337f740d5
author Seigo Nonaka <nona@google.com> 1493746324 +0000
committer android-build-merger <android-build-merger@google.com> 1493746324 +0000

Merge "Fix NPE happens if no source was specified to font element." into oc-dev
am: b3e92234fa

Change-Id: If06bf0e49030839f1b4f95c0a776e4aab1ed94d8