| commit | abef99cf6a18873ff2079285d26755b41aed979b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 19:45:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 19:45:38 2014 +0000 |
| tree | 52ce1845696e788825e05127a459d7370e0efdfe | |
| parent | 11281de7a2c335ed5410fa83b275173130714f52 [diff] | |
| parent | 02c355d10b3235b73d58ab54222721e32bec3f1f [diff] |
am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '02c355d10b3235b73d58ab54222721e32bec3f1f': Import translations. DO NOT MERGE