| commit | ffcdb67922a5db5fe725d6986e0b140cd33cd4ed | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 19 22:23:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 19 22:23:53 2014 +0000 |
| tree | d2b70585d8fd4d57f3977547fb615b47b05085e9 | |
| parent | f2c7c32288af06032909957c74f13c33337c22ea [diff] | |
| parent | b42786f4911368800116e671dee54079d3bee29f [diff] |
am b42786f4: (-s ours) am 67b404d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'b42786f4911368800116e671dee54079d3bee29f': Import translations. DO NOT MERGE