| commit | cd274340ac87b44f9db6cc96b8592e8d0319e3ec | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 19 22:54:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 19 22:54:57 2014 +0000 |
| tree | 9d30c64fb9c34dcc00486e5ad67f9e8696ff8ba9 | |
| parent | ee257163891bc46f657a670e3852a651ae974231 [diff] | |
| parent | 101cdca729902a80a89c5305e226630e2129bbe4 [diff] |
am 101cdca7: (-s ours) am 965048d9: (-s ours) am 2ffe6a23: (-s ours) am d25f8443: (-s ours) am 6a887105: (-s ours) am c04edfc3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '101cdca729902a80a89c5305e226630e2129bbe4': Import translations. DO NOT MERGE