| commit | f6b26149df994578ed2cd94531aead626bd10585 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:53:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:53:07 2015 +0000 |
| tree | 725f84512baa8daa7ba4976b7f97f4b6e20ceb15 | |
| parent | a61e21cc6c41613d0a9671ff5ab9b9e2a6eebbae [diff] | |
| parent | 8f89a1fba49fec29fec935240e5340ae4c979e81 [diff] |
am 8f89a1fb: (-s ours) am 0763101a: (-s ours) am 10a0dc21: (-s ours) am 4d9ee901: (-s ours) am a5698f20: (-s ours) Import translations. DO NOT MERGE * commit '8f89a1fba49fec29fec935240e5340ae4c979e81': Import translations. DO NOT MERGE