| commit | b68029827909d52b9b43d774cc9eae2351b9ee7f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon May 25 14:17:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 25 14:17:42 2015 +0000 |
| tree | 06cf10aedf58ccc5b7db0e220b72f4894604d66e | |
| parent | 1901bd9137da6db230bf5854313edd79c7ac9e9e [diff] | |
| parent | 725cdd9e6a7a96a68da1620d48842cf54a338e6d [diff] |
am 725cdd9e: (-s ours) am e4b39596: (-s ours) am e3dde1bf: (-s ours) Import translations. DO NOT MERGE * commit '725cdd9e6a7a96a68da1620d48842cf54a338e6d': Import translations. DO NOT MERGE