| commit | d4d0c1b3c40241e1b19f2f36992f09021158a2a6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 20 20:29:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 20:29:20 2015 +0000 |
| tree | 1478d5f3fff7692808019347821f3b24a7fb1124 | |
| parent | 88d51c3c07dc5ea80e1cb5253446c53aa59e3749 [diff] | |
| parent | 44c44a2b6ae1d9b7088d0846f6ae49dc61ebb0ea [diff] |
am 44c44a2b: (-s ours) am ca49ae5a: (-s ours) Import translations. DO NOT MERGE * commit '44c44a2b6ae1d9b7088d0846f6ae49dc61ebb0ea': Import translations. DO NOT MERGE