| commit | a697cbecceccbfd610bf08fdaae2c5b95f501783 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:58:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:58:39 2014 +0000 |
| tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
| parent | edb69ed9fc72138471df6f6d787ed25fa41c45b3 [diff] | |
| parent | ef69114ffb59392c7f2f7872e1c27d2a43f35c21 [diff] |
am ef69114f: (-s ours) am 738ad8f5: (-s ours) am 88b88fc5: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit 'ef69114ffb59392c7f2f7872e1c27d2a43f35c21': Import translations. DO NOT MERGE