| commit | cd96200ad439a7211c7434ae6f0e9a4bf7c075f2 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Apr 30 00:59:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:59:26 2014 +0000 |
| tree | d480a9df18213d791f716ded764bcd22e74dbd2d | |
| parent | 3b505c5c8aeb92bc90f6ee507186dca428310499 [diff] | |
| parent | ace1754961d5b6b640e43a2aad0189cd62821a53 [diff] |
am ace17549: (-s ours) am c1f2a213: (-s ours) am ea8ec3cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'ace1754961d5b6b640e43a2aad0189cd62821a53':