| commit | c87c6a2a4630e53d8dc07eb53095776fa31c463f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Feb 20 18:47:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 18:47:43 2014 +0000 |
| tree | 9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0 | |
| parent | 46f1744acf7bd795ac80ed10a5b6bd3f03682b46 [diff] | |
| parent | a69996e45c7c40d971b05a56866b7ac5c7f617de [diff] |
am a69996e4: (-s ours) am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'a69996e45c7c40d971b05a56866b7ac5c7f617de': Import translations. DO NOT MERGE