| commit | ee32108abc85a4d80ebe693d2747e6d1ac19cfd0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:41:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:41:00 2014 +0000 |
| tree | f466d32d34558edeba7e9989e3cdcd9719a6887b | |
| parent | a7c45668c6d30a1e9db643457084dfda1421ea56 [diff] | |
| parent | 698a2f251a483c60ae27117d31cb0b5b528fddce [diff] |
am 698a2f25: (-s ours) am ab7cf487: (-s ours) am 794ce1e8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '698a2f251a483c60ae27117d31cb0b5b528fddce': Import translations. DO NOT MERGE