| commit | 274ca40fd0768ab903e492ec8e120b7c33ccf339 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Aug 25 16:58:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 25 16:58:32 2014 +0000 |
| tree | 890a65a3dfac7c5a414863eaeee4e492c4ce127a | |
| parent | a39ccf6bdb4a8dc40281a9ad1687f735d6d3025f [diff] | |
| parent | 0a0a0966de99949bbacc8064563714670369bfa2 [diff] |
am 0a0a0966: (-s ours) am d9960178: (-s ours) am cef6b220: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '0a0a0966de99949bbacc8064563714670369bfa2': Import translations. DO NOT MERGE