| commit | 864a1a6af4e227bd89aebee24e829c77c8cd89e4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Apr 30 00:59:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:59:30 2014 +0000 |
| tree | d480a9df18213d791f716ded764bcd22e74dbd2d | |
| parent | f525270191829443cf36e77cdcb95a58bfa81d30 [diff] | |
| parent | e0fe275aa48e4cc98c6bf56db47a73fe74a149e9 [diff] |
am e0fe275a: (-s ours) am 46f2a32e: (-s ours) am 8c30c2ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e0fe275aa48e4cc98c6bf56db47a73fe74a149e9':