OSDN Git Service

am f26c96ed: resolved conflicts for merge of 34cb6460 to master
authorJustin Koh <justinkoh@google.com>
Fri, 21 Feb 2014 18:34:56 +0000 (10:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Feb 2014 18:34:56 +0000 (10:34 -0800)
commitb8ea99c378270c8384b6be2d5732828981aaf671
tree285d6025505f7301f6bd8bf3edd8f819ed5f96e0
parent9e3586dce6f02f21435390eb98e68126f7c81e3f
parentf26c96edc5ce0d67f9dc35c95eea91ab92ea9c64
am f26c96ed: resolved conflicts for merge of 34cb6460 to master

* commit 'f26c96edc5ce0d67f9dc35c95eea91ab92ea9c64':
  Change core_tiny to not be minimal font footprint.