| commit | 2b69caa3eb30016fb861cf785f2225808b53f738 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Jul 22 17:05:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 22 17:05:02 2014 +0000 |
| tree | e56b19f1a4c5194853bd20f9a6d319ef61ddd17e | |
| parent | 5a86191984f11b31ef8a1eb695a26d351de5fdb8 [diff] | |
| parent | 2afed68e0154da42fe375991cdc051ba0f04ac45 [diff] |
am 2afed68e: (-s ours) am c4f97b42: (-s ours) am c60e9d6e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '2afed68e0154da42fe375991cdc051ba0f04ac45': Import translations. DO NOT MERGE