| commit | 5195064e8280c85fbda996df58e247e8a8509d1f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 18:33:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 18:33:04 2014 +0000 |
| tree | 52ce1845696e788825e05127a459d7370e0efdfe | |
| parent | 03c248aadece8459d2568dd8721d46cf748c7a56 [diff] | |
| parent | 6e90b3c078baa2b6c6398376490b7c540309be70 [diff] |
am 6e90b3c0: (-s ours) am f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '6e90b3c078baa2b6c6398376490b7c540309be70': Import translations. DO NOT MERGE