| commit | 62c2a7337b60b60ab0204572a792e88f9d99684e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Apr 29 14:46:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 14:46:24 2015 +0000 |
| tree | b4ed624379be0c71be7a9d9b93845584cf3fbcc6 | |
| parent | bb4ed9aa3aec4b787c8cd5e4f04b7f95302b76f9 [diff] | |
| parent | 6b960a9e04f25a5827fcc0e675b2de582f8aff84 [diff] |
am 6b960a9e: (-s ours) am e1b43ee9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '6b960a9e04f25a5827fcc0e675b2de582f8aff84': Import translations. DO NOT MERGE