commit | b5480f653fc8242a36053709b5cea570358518e6 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Sep 29 21:02:48 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 29 21:02:48 2014 +0000 |
tree | eaa113bd4bb5f52de29ff0349a1d371170af57ab | |
parent | 374b10b58b7586689880cfd64342d1160d3a3532 [diff] | |
parent | d73040202084411199925419c6856406c8df10fe [diff] |
am d7304020: (-s ours) am 6744422b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'd73040202084411199925419c6856406c8df10fe': Import translations. DO NOT MERGE