| commit | 5db19829c3281e5d3182ea799e6e99a17f174eba | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 29 22:53:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 29 22:53:12 2015 +0000 |
| tree | bfcd34d077ce708764f7a6dbf865b5d4cb460d69 | |
| parent | a1d581ff439ff3dcd67f2e52e8ca4a047d4f837a [diff] | |
| parent | c83fd7b9d3360cea49a004b0b70b706165f3f031 [diff] |
am 645c4b60: (-s ours) am f053e4b3: (-s ours) Import translations. DO NOT MERGE * commit '645c4b6034303e5e602a47d24995931a70a84460': Import translations. DO NOT MERGE