| commit | eb68a1f0266403c48215e9aa72bddfac8afd8a87 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 01 17:02:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 01 17:02:47 2014 +0000 |
| tree | 57328d9b59ba6d0fb8b6eaa7612486d2408b654f | |
| parent | b3ab7b95a687e4de13d06822fb295ee726b4b42f [diff] | |
| parent | 576e845032f3b6b1e44c432b8a9a7336c8c1cdbe [diff] |
am 576e8450: (-s ours) am eb1618cf: (-s ours) am 42d0c353: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '576e845032f3b6b1e44c432b8a9a7336c8c1cdbe': Import translations. DO NOT MERGE