| commit | 4b9936d302679369d6ec912bfd248366afafbe85 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 21 16:46:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 21 16:46:32 2014 +0000 |
| tree | 77ae6dc696eb7f2942e6d5bfebdccb95eebf8a6e | |
| parent | e1c66c8ddb26ffe5361949b9e6b82f802bb6a671 [diff] | |
| parent | 801517fe752f5352023bf4da8f3bb22727529963 [diff] |
am 801517fe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '801517fe752f5352023bf4da8f3bb22727529963': Import translations. DO NOT MERGE