| commit | b33e23ead7e9b9a1327168ffcca48a3cbe668398 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 19:49:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 19:49:37 2014 +0000 |
| tree | 6cc922b18cb72799525218d64e5dcb4757b03131 | |
| parent | 660630f24251d62d13d13ce0301f5d2762414833 [diff] | |
| parent | abef99cf6a18873ff2079285d26755b41aed979b [diff] |
am abef99cf: (-s ours) am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'abef99cf6a18873ff2079285d26755b41aed979b': Import translations. DO NOT MERGE