| commit | 2a7f5a417cfa182a452a4114ca64041c0be55930 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 01 17:07:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 01 17:07:13 2014 +0000 |
| tree | 12a6aa0efcb52559bba3f3fba8847a180891e528 | |
| parent | 299f6a772263543afe4913c99516c3c112a03dff [diff] | |
| parent | 0a39f81cf69cf66db5cced018e7606c084657883 [diff] |
am 0a39f81c: (-s ours) Import translations. DO NOT MERGE * commit '0a39f81cf69cf66db5cced018e7606c084657883': Import translations. DO NOT MERGE