OSDN Git Service

am ee144b1e: resolved conflicts for bd57dac5 to stage-aosp-master
authorStephen Hines <srhines@google.com>
Sat, 3 Oct 2015 00:46:17 +0000 (00:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 3 Oct 2015 00:46:17 +0000 (00:46 +0000)
commit697e3dd6b9a8be4451e19ab7c03ced310602b92a
treee736cb740f4c8e4a0586e2a554b7d9e9773f31b0
parent3cb53543e224c0f98801d71c22a2d81974186597
parentee144b1e60a88e8f097113e046813f0b61c38b9b
am ee144b1e: resolved conflicts for bd57dac5 to stage-aosp-master

* commit 'ee144b1e60a88e8f097113e046813f0b61c38b9b':
  Don't unregister Fonts from renderer at destruction