| commit | ea3e18d4d852a8d775db839792678dcd008fad43 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 01 19:02:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 01 19:02:51 2015 +0000 |
| tree | 293c8c68dd7f608eaf87c4b181e46070353dfe57 | |
| parent | 3f154cf3ff1e419d4011bab4a8a26ede984d5569 [diff] | |
| parent | 535ce5b824a8b06e0d1abfb7a460fc90a96a78ed [diff] |
am 535ce5b8: (-s ours) am 6a83e391: (-s ours) Import translations. DO NOT MERGE * commit '535ce5b824a8b06e0d1abfb7a460fc90a96a78ed': Import translations. DO NOT MERGE