| commit | 4708550ab413d0120cfe0d93daf6f200e49be625 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 23 12:55:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 12:55:53 2015 +0000 |
| tree | 87f64f088d23e423371f5190548b2a0522713c2b | |
| parent | 18367b648b977bf52918bb508a0f628953cfcf6e [diff] | |
| parent | 674d1d6be522defb7934c9e66e439ed99e827bc4 [diff] |
am 674d1d6b: (-s ours) am 47d342c3: (-s ours) Import translations. DO NOT MERGE * commit '674d1d6be522defb7934c9e66e439ed99e827bc4': Import translations. DO NOT MERGE