commit | 2d1654b054eae4f08831f1c753c9ccc66a585980 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Fri Dec 09 14:58:14 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 09 14:58:14 2011 -0800 |
tree | 5d8dfae125cedfc4cbf96212b35960288a0a04f6 | |
parent | d9e771db74ea09560132d5937433bbf1006b389a [diff] | |
parent | 692999a463aca8730fd5949448449dbe4d4403e9 [diff] |
am 692999a4: (-s ours) am f4e80c84: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '692999a463aca8730fd5949448449dbe4d4403e9': Import revised translations. DO NOT MERGE