| commit | 1204e22aae020a596de44e97147ce57b751143d1 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 02 12:47:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 12:47:45 2014 +0000 |
| tree | 2a54d71713690f707ec8415fa2a99e52a49843ac | |
| parent | 0b3c43b76d2a18eb40dccdad8f3addf222619483 [diff] | |
| parent | 25b2b617f242ff3a10f207190a63b1ec3d99b76d [diff] |
am 25b2b617: (-s ours) am a073a7d6: (-s ours) am e2218a6f: (-s ours) am 778ae41f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '25b2b617f242ff3a10f207190a63b1ec3d99b76d': Import translations. DO NOT MERGE