| commit | 43f0036509afe8f3ef3afbc42ae8f427a266fb82 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jul 30 00:05:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 00:05:10 2015 +0000 |
| tree | ed8dd8f921364307880b2b1206be061daaf76038 | |
| parent | e343460d1cd1deaa5a70d2aab8e40856bfc826b1 [diff] | |
| parent | e7da8113de6f76fb82d2fa2cda92e3c433a835a2 [diff] |
am e7da8113: (-s ours) am 1472a455: (-s ours) am 60148878: (-s ours) am af309ba0: (-s ours) Import translations. DO NOT MERGE * commit 'e7da8113de6f76fb82d2fa2cda92e3c433a835a2': Import translations. DO NOT MERGE