| commit | ad141bd7e267c74daf33416412f9aab30e9751fa | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 26 15:34:14 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 26 15:34:14 2013 -0800 |
| tree | 00305c6c9559fb47f34dc37dfa3043c6095ed06c | |
| parent | b6d55917122b314c4ec547263e774934d67f2973 [diff] | |
| parent | dd6517c9dff66a2165e147201e813e1f305425c2 [diff] |
am dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'dd6517c9dff66a2165e147201e813e1f305425c2': Import translations. DO NOT MERGE