| commit | c55a29c45e699418513f4c95c204c12839b1c79f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 06 09:52:34 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 06 09:52:34 2013 -0700 |
| tree | b0696bd15fb70b8914739e25d40f89a6cbef3d68 | |
| parent | 551624c46c834e8327aebf690d59fca6462941dc [diff] | |
| parent | ddde9617d62df82107252a23dc75988f67939678 [diff] |
am ddde9617: (-s ours) am f96b104a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'ddde9617d62df82107252a23dc75988f67939678': Import translations. DO NOT MERGE