| commit | 3e74f147c2f436d946c531e9998377129c92ff1b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 27 18:51:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 18:51:29 2014 +0000 |
| tree | 0058fd1a78994683a244210ed5996745329b84e9 | |
| parent | 8af332aba8e959cec1821a7499f48a3f3e172268 [diff] | |
| parent | 33b629c5bdde5d7f3b5d6b6f49456296739d4bcf [diff] |
am 33b629c5: (-s ours) am 3a9c1a0f: (-s ours) Import translations. DO NOT MERGE * commit '33b629c5bdde5d7f3b5d6b6f49456296739d4bcf':