| commit | 994040386569e620764257e6ccc763519fb572a9 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 17 08:44:11 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 17 08:44:11 2013 -0700 |
| tree | 972bf517a1f5cc3c9d1a92501e00c43c51a0c24c | |
| parent | 69c1fbdfd538a60340d7867408dfe227bbb2fff3 [diff] | |
| parent | bbfcf920e9962060ddf3929cad26fde53ce8df4a [diff] |
am bbfcf920: (-s ours) am a43bc500: (-s ours) am 3d2ecd14: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'bbfcf920e9962060ddf3929cad26fde53ce8df4a': Import translations. DO NOT MERGE