| commit | ca770accdc693d4bc57bc8d259984d376a3f8903 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:08:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:08:53 2014 +0000 |
| tree | 445619ecfebb11acc3e4472f98d603997e2bc92d | |
| parent | c54cb6abd93b64f7168b4d6f67f48a0dbc1fb422 [diff] | |
| parent | 8f55261aad9e293668d0e8befe7d6aff8e556dc7 [diff] |
am 8f55261a: (-s ours) Import translations. DO NOT MERGE * commit '8f55261aad9e293668d0e8befe7d6aff8e556dc7': Import translations. DO NOT MERGE