| commit | c9b7283493f433968ba4cb68c99b0922dd8b9e9d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 29 23:07:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 29 23:07:23 2015 +0000 |
| tree | 3dee6e34eb6327e49a4460d4e34da77d3daf6ebf | |
| parent | 7a1d98c3a5cbfccbe4368f9f740da77f03d3fa4d [diff] | |
| parent | 2b0ba99f37e2f052c589cd1f1065cc0f844d5646 [diff] |
am 9e923ffe: (-s ours) am c33fc25b: (-s ours) am 645c4b60: (-s ours) am f053e4b3: (-s ours) Import translations. DO NOT MERGE * commit '9e923ffeddeb32021b6c2a6250371316ea9a7177': Import translations. DO NOT MERGE