| commit | 822b0367d41d46a101f5a7b87094718811976517 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 15:55:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 15:55:49 2015 +0000 |
| tree | ab3ad22f5c0c09dacfba140fc41359a00f320999 | |
| parent | ff24828ed44a1d6c9ca8ba934f5cab4d092a728c [diff] | |
| parent | 51a59c80a1e60f91e446b0b55282204501cf56a7 [diff] |
am 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import translations. DO NOT MERGE * commit '51a59c80a1e60f91e446b0b55282204501cf56a7': Import translations. DO NOT MERGE