| commit | cad59dd01516a8b531919967c70204881a767cae | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 16:15:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 16:15:59 2014 +0000 |
| tree | 391da50e232f2dd994a1fc0e869c6bf7a89b92a3 | |
| parent | 11b751add13b1f6ae1f88af06faa39eeb6395834 [diff] | |
| parent | fd02e2318991ee6d8e9156c38e66fd72fa7b0fea [diff] |
am 0c137bb9: (-s ours) am 67ea9443: (-s ours) am 45e72ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '0c137bb9d85234e71d89a10889fdc93a8fb847ef': Import translations. DO NOT MERGE