| commit | 8c8861dfd49a872a1d66ccc92ed894c8ac6e96bc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 26 20:24:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 26 20:24:33 2015 +0000 |
| tree | 9b1c6cc822ebc60c88ceb56b26b371e2ff50b81c | |
| parent | 153281e5a15c9fa4db08dace265eb6556216066f [diff] | |
| parent | 1005a3d5741b7e529beefb05b24d3cbd70543b53 [diff] |
am 1005a3d5: (-s ours) am 4914bbf7: (-s ours) Import translations. DO NOT MERGE * commit '1005a3d5741b7e529beefb05b24d3cbd70543b53': Import translations. DO NOT MERGE