| commit | 2b0ba99f37e2f052c589cd1f1065cc0f844d5646 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 29 23:01:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 29 23:01:32 2015 +0000 |
| tree | bfcd34d077ce708764f7a6dbf865b5d4cb460d69 | |
| parent | 5cb83a40437c492b155353b00fd2f0c161ff6804 [diff] | |
| parent | 5db19829c3281e5d3182ea799e6e99a17f174eba [diff] |
am c33fc25b: (-s ours) am 645c4b60: (-s ours) am f053e4b3: (-s ours) Import translations. DO NOT MERGE * commit 'c33fc25b336de7ca9679ed830ac42a93bb36446f': Import translations. DO NOT MERGE