| commit | 9108696f95e4fe53054c4c1ca196ded764ab7e31 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 12 14:56:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 14:56:57 2014 +0000 |
| tree | 42b747cf4799d9b41378afa1dfb9879bb00ed2c7 | |
| parent | d57eefa4dd2e29d52331e2097b4552907280ad2d [diff] | |
| parent | 1e8178aa128ae9bba13fc4f69c36781bddefaf81 [diff] |
am 1e8178aa: (-s ours) am 6b6c6264: (-s ours) Import translations. DO NOT MERGE * commit '1e8178aa128ae9bba13fc4f69c36781bddefaf81': Import translations. DO NOT MERGE