| commit | 503177ed6dd3c555a9ddb02d8662032754fa8e04 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 05 22:42:28 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:42:28 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | 30eca9f6c0dd268a2873cd0ca35eef70f087af89 [diff] | |
| parent | 8c1df1b24a5dd80174a548f30e9da0faf57d5ae9 [diff] |
am 8c1df1b2: (-s ours) am 4b643f0e: (-s ours) am 40885045: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '8c1df1b24a5dd80174a548f30e9da0faf57d5ae9':