| commit | ab7fea53e4b8353377119fa8c8f45fdad37dafd5 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue May 01 10:37:40 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 01 10:37:40 2012 -0700 |
| tree | 289a1250c6fbf4f9c9c1a6492c7b527783f46afb | |
| parent | 4ee08a2e2e68e6be7bd9f14a30e5cee5c93cb001 [diff] | |
| parent | 4f4b45dac21191808dd79c9f4e78c0195ec66571 [diff] |
am a1630d9f: (-s ours) am 1f0f6c7e: Import translations. DO NOT MERGE * commit 'a1630d9f1e92099b4b9f505f397af4ee885fea02': Import translations. DO NOT MERGE