| commit | fb91df7613330843d2f1847e82080c8dcb96bd9e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jun 10 15:11:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 10 15:11:34 2015 +0000 |
| tree | 0c898c48c83a453f74ac94b509f51b2a18737f70 | |
| parent | 91806d151264d8bc314c41df27432310131424ad [diff] | |
| parent | e9df0400858986fef21aac0b6988253a35fd66b6 [diff] |
am e9df0400: (-s ours) am d4de959b: (-s ours) Import translations. DO NOT MERGE * commit 'e9df0400858986fef21aac0b6988253a35fd66b6': Import translations. DO NOT MERGE