summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2013-12-10 01:58:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-10 01:58:03 +0000
commit7aca3f81811006cc6ef61dc03d08fc4512ac2c02 (patch)
tree6f4c219b724d8c8268370541f63942abf9b297ca
parentc82b1f07bd38fa3103fb4692fe19be0023d75864 (diff)
parentae6e74bbdac17b94dbd8264ab46dd8d46fa64377 (diff)
downloadfreetype-7aca3f81811006cc6ef61dc03d08fc4512ac2c02.tar.gz
am ae6e74bb: (-s ours) Merge remote-tracking branch \'origin/kitkat-dev\'
* commit 'ae6e74bbdac17b94dbd8264ab46dd8d46fa64377': Initial empty repository
0 files changed, 0 insertions, 0 deletions