| commit | 2c6fe6c1ca362411f42afc22bb4c08082d03b636 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 19 14:07:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 19 14:07:53 2015 +0000 |
| tree | ff902917e64d15483d08ce332d98b8bf3d2dcc33 | |
| parent | 6ac4af0f4b31d3e33863263509d5a05bfc84d273 [diff] | |
| parent | 0c6eba366e77daeedecdffdd4d1dcf9406d39117 [diff] |
am 0c6eba36: (-s ours) am c2e81a0c: (-s ours) Import translations. DO NOT MERGE * commit '0c6eba366e77daeedecdffdd4d1dcf9406d39117': Import translations. DO NOT MERGE