| commit | 12336a59adf77f5dd702ac03e89184a1cb2123e9 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 17 08:40:42 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 17 08:40:42 2013 -0700 |
| tree | 4712f36f7de76f500cc7098e5eae50dc6955b424 | |
| parent | 743d2348aa547cb26569a2d62a5e711c68c742e5 [diff] | |
| parent | c11c43ee57d26b2d79c7939f9f6a9eaa4e6839d5 [diff] |
am c11c43ee: (-s ours) am b923efba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c11c43ee57d26b2d79c7939f9f6a9eaa4e6839d5': Import translations. DO NOT MERGE