| commit | ad5e2b85cff224870eb869f8dd6b568a9ea389bb | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 14 10:49:14 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 14 10:49:14 2013 -0700 |
| tree | 4d76abe40d0f4aff57de0f1b906ec24d7b14281e | |
| parent | a80aa9e07a282a79059af33076f5b0a69ac6378f [diff] | |
| parent | e3e194ae8bd3ad269f0524f24f4b913b0dd6eb6b [diff] |
am e3e194ae: (-s ours) am 8cdfa5cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev * commit 'e3e194ae8bd3ad269f0524f24f4b913b0dd6eb6b': Import translations. DO NOT MERGE