| commit | 8eed66742ef0b771365080fe4fa322cb24055fed | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Jun 26 17:04:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 26 17:04:54 2014 +0000 |
| tree | fae0b696f025330ffe5301bafd630fc7f8f120c8 | |
| parent | ec5fb8e9474e4fb69c8643d67eeab53514835bfc [diff] | |
| parent | b22ef14f4470fabd461fe3b56c0dd38110fb8cdb [diff] |
am b22ef14f: (-s ours) am bbf69273: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'b22ef14f4470fabd461fe3b56c0dd38110fb8cdb': Import translations. DO NOT MERGE