| commit | 151eadfde3e0da58b6ba695e747991901a2b7d6d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Feb 04 18:58:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 04 18:58:09 2015 +0000 |
| tree | be8647922d21dfcd46f2622c6ac598ca96f6f7a3 | |
| parent | 281dfe7fd216c1257758c0258dfeb3fdcb774227 [diff] | |
| parent | 8911c2aeb17dfde123b9d412f700c20a33babbfc [diff] |
am 8911c2ae: (-s ours) Import translations. DO NOT MERGE automerge: 140a22d -s ours * commit '8911c2aeb17dfde123b9d412f700c20a33babbfc': Import translations. DO NOT MERGE