| commit | 341ff2b08380fcab0f2313fb4feca732cf70f840 | [log] [tgz] |
|---|---|---|
| author | Justin Ho <justinho@google.com> | Fri Feb 10 10:19:58 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:19:58 2012 -0800 |
| tree | 3bff43a9256894541d407f8d6ea18ae375b9ca31 | |
| parent | 8dc1dabd254249b7ddb8743e88fdb96580ffc585 [diff] | |
| parent | f994f353f705dc69c1e57bd6785092218fd630d2 [diff] |
am f994f353: (-s ours) am 448249d1: (-s ours) am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit 'f994f353f705dc69c1e57bd6785092218fd630d2': Import translations. DO NOT MERGE