| commit | c9943086044f6be109cb3cfd8543c599e1f3eca5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 20:14:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 20:14:52 2014 +0000 |
| tree | 3f625575b6c4a762852f88c1524a9b94bfec5ee1 | |
| parent | 0a0d7933c239b0ccbbf8c0e7a300ff78923dbc75 [diff] | |
| parent | 1f04def9e83e8232d7460d2755aef53b74803331 [diff] |
am 1f04def9: (-s ours) am fd522d11: (-s ours) Import translations. DO NOT MERGE * commit '1f04def9e83e8232d7460d2755aef53b74803331': Import translations. DO NOT MERGE