| commit | 201a77ea399527da0f69faf14cc26162909f43c7 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Feb 02 13:49:08 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 02 13:49:08 2012 -0800 |
| tree | 40cbb220f320cdba115e96b714e33f779dec0b19 | |
| parent | c61223ce85bc0010130c4fcbc6b3a4aa0543192b [diff] | |
| parent | 940f2a7479eb68af290f631d227bc79dcf29a7c5 [diff] |
am 940f2a74: (-s ours) am 67a50f99: Import translations. DO NOT MERGE * commit '940f2a7479eb68af290f631d227bc79dcf29a7c5': Import translations. DO NOT MERGE