| commit | 701449e85395d7a81d244d4b115b9ef4ae2f06d9 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Feb 20 18:39:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 18:39:43 2014 +0000 |
| tree | 693a938d06c7cc9157dab1d9bc88ca7dc243905d | |
| parent | 50d0afa43af2b215ddddbc7a3adfb8b5d85cb549 [diff] | |
| parent | c9443fc54caa789c4e3c64e7d9feaee8ac00506f [diff] |
am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c9443fc54caa789c4e3c64e7d9feaee8ac00506f': Import translations. DO NOT MERGE