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)
* commit 'f26c96edc5ce0d67f9dc35c95eea91ab92ea9c64':
  Change core_tiny to not be minimal font footprint.


Trivial merge