| commit | 9d062451d426080589952b2950ab3cc5e1145884 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 05 22:51:15 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:51:15 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | 8cc7a9d21f14aa5819544e94b113cfc311e8178d [diff] | |
| parent | 4830bc50848e3c575e74ef9c996821af45943cf7 [diff] |
am 4830bc50: (-s ours) am dc5f592c: (-s ours) am 78f5ef71: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '4830bc50848e3c575e74ef9c996821af45943cf7':