| commit | f6abe65a3b40b35eb8e44681f365e53eb9726ce6 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 16 18:22:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 18:22:27 2014 +0000 |
| tree | 5fc024fbda4e9816cbf71f5bb0d9ae4ecb6fc6d2 | |
| parent | 8e0d8afbec66e285c13fe2fe676f5f799487e79a [diff] | |
| parent | 891f997c908ac26373aa0eee213bc93598c29d7b [diff] |
am 891f997c: (-s ours) am f5cec932: (-s ours) am aaddee70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '891f997c908ac26373aa0eee213bc93598c29d7b': Import translations. DO NOT MERGE