diff options
author | 2010-08-23 19:09:17 -0700 | |
---|---|---|
committer | 2010-08-23 19:09:17 -0700 | |
commit | e07d6a776ad818e21de3598d115ec5de0b12481b (patch) | |
tree | a394c40f68efc5dab013eeebefc175cb45b49fe5 /java/src | |
parent | 78c4611719f10b4a53ade54ab5eeb390061737a3 (diff) | |
parent | 479a3a7891e23521cfb7ea1e835b8b3cfb882c5f (diff) | |
download | latinime-e07d6a776ad818e21de3598d115ec5de0b12481b.tar.gz latinime-e07d6a776ad818e21de3598d115ec5de0b12481b.tar.xz latinime-e07d6a776ad818e21de3598d115ec5de0b12481b.zip |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I1dba838629fe6e7c16f7684a0d438328cda1c325
Diffstat (limited to 'java/src')
0 files changed, 0 insertions, 0 deletions