| commit | 794a751ba6b6322883c36980e5e2999f6322f005 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 10:55:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:55:54 2015 +0000 |
| tree | c560330f63f0d44302791c6c42268f18c5732def | |
| parent | 56cfcbdd0b0adb33c7ab325022ce8d3698059b60 [diff] | |
| parent | e984bbe47e0b246b2e255b829a7d07e704c966b3 [diff] |
am e984bbe4: (-s ours) am d2397fbc: (-s ours) Import translations. DO NOT MERGE * commit 'e984bbe47e0b246b2e255b829a7d07e704c966b3':