| commit | c1a980a60bfe271a846cf66107eca8adc67c3334 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Aug 15 16:22:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 15 16:22:20 2014 +0000 |
| tree | 2a8ebba0f47b613014d82f5f582c5b56e6a1d15e | |
| parent | fd27a380cb1ee51b0d08c87616b0cde852ee2e70 [diff] | |
| parent | 427b0faa5e4991e8a7e16f9a4f4503cebd6258d2 [diff] |
am 6b225f5d: (-s ours) am ca60c668: (-s ours) am 8c03c580: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '6b225f5da7e6dad10f8ee0e66fa1000d4ec2c0e0': Import translations. DO NOT MERGE