| commit | c8e870e60d34c3ab4ac5d1ea4d316ed6602670bf | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jul 30 00:20:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 00:20:33 2015 +0000 |
| tree | ed8dd8f921364307880b2b1206be061daaf76038 | |
| parent | 43f0036509afe8f3ef3afbc42ae8f427a266fb82 [diff] | |
| parent | 49cf8b4e69ff66e7a7bf174ab2915a3663ffd394 [diff] |
am 49cf8b4e: (-s ours) am 939a5a26: (-s ours) am da4cd376: (-s ours) am 0c44c231: (-s ours) am 0497f6d3: (-s ours) Import translations. DO NOT MERGE * commit '49cf8b4e69ff66e7a7bf174ab2915a3663ffd394': Import translations. DO NOT MERGE