| commit | 01e05fd20e12d5ff978365b1e2bd78fd5643c1eb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 01 19:47:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 01 19:47:36 2014 +0000 |
| tree | 3d3ca404867b086040d8b05ce9860cee0da8906d | |
| parent | 0a8db3acefd9d5c2f97d8366c07960c1fd0427f1 [diff] | |
| parent | 299f6a772263543afe4913c99516c3c112a03dff [diff] |
am 299f6a77: (-s ours) Import translations. DO NOT MERGE * commit '299f6a772263543afe4913c99516c3c112a03dff': Import translations. DO NOT MERGE