| commit | e7da8113de6f76fb82d2fa2cda92e3c433a835a2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 23:51:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 23:51:20 2015 +0000 |
| tree | 0734c5bbd5a98ca48ca90bbb9b0c4cc22146e7b0 | |
| parent | 583954f609488449a423ff2ba5c6dbec109eaa12 [diff] | |
| parent | 1472a4559e08487b7fe070a720b151163f16c1f9 [diff] |
am 1472a455: (-s ours) am 60148878: (-s ours) am af309ba0: (-s ours) Import translations. DO NOT MERGE * commit '1472a4559e08487b7fe070a720b151163f16c1f9': Import translations. DO NOT MERGE