| commit | 6685549225b0b2f24649939bbf5a4a28d700e00c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 26 23:25:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 26 23:25:52 2015 +0000 |
| tree | a88d04d8176a9fcaba740db70329b61f921db5ff | |
| parent | affdfde04723b5d0c0f44420edb24acb6f18dd5b [diff] | |
| parent | 2edf17283144f34f6135aecac1e48ff1f5cb779f [diff] |
am 2edf1728: (-s ours) am 327a6ea5: (-s ours) Import translations. DO NOT MERGE * commit '2edf17283144f34f6135aecac1e48ff1f5cb779f': Import translations. DO NOT MERGE