| commit | 660630f24251d62d13d13ce0301f5d2762414833 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 19:49:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 19:49:33 2014 +0000 |
| tree | 6cc922b18cb72799525218d64e5dcb4757b03131 | |
| parent | 5ac6a47f25f603af68c2cc222d2713aea187b2f8 [diff] | |
| parent | 11281de7a2c335ed5410fa83b275173130714f52 [diff] |
am 11281de7: (-s ours) am 89523569: (-s ours) am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '11281de7a2c335ed5410fa83b275173130714f52': Import translations. DO NOT MERGE