| commit | ee63519d2a893a59f10cd8b29bec9e3006edc486 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Oct 05 09:40:53 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 05 09:40:53 2013 -0700 |
| tree | 2960accfae8c2b7accb672df3724a013f98b1510 | |
| parent | 493324ebaeaec9b1f57bef3ca6b93a11701487ac [diff] | |
| parent | 2abb3443170885bc41ccfaa903796f6435b10839 [diff] |
am 2abb3443: (-s ours) am 040cfe56: (-s ours) am 8aecb7ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '2abb3443170885bc41ccfaa903796f6435b10839': Import translations. DO NOT MERGE