| commit | 2319a4debf5d30c23ecfaa0c745b7d05f472ed37 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 12 19:00:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 12 19:00:31 2014 +0000 |
| tree | eec0511e5543e3faa1700c0cc5a5ffdbc6240bb3 | |
| parent | b1eda08d5e147fb400555835d2a1edbeab127f4b [diff] | |
| parent | 4ae16a510da9799bdb29a267028cf68f1d17cc85 [diff] |
am 4ae16a51: (-s ours) am ea2d4258: (-s ours) am f1bc3d1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '4ae16a510da9799bdb29a267028cf68f1d17cc85': Import translations. DO NOT MERGE