| commit | e52f83d9ec2397542a9e28e8178adb1ffafab204 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jun 19 16:32:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 19 16:32:44 2015 +0000 |
| tree | 38f3a8988f163793facfd096f037948c3ee16de7 | |
| parent | 1607aa63b651bbac2abae493f6757f7dadaf0069 [diff] | |
| parent | a3f384d249517cee9646aa7c5d48ef85dd8cc26c [diff] |
am a3f384d2: (-s ours) am b005f239: (-s ours) am af7d8bbd: (-s ours) Import translations. DO NOT MERGE * commit 'a3f384d249517cee9646aa7c5d48ef85dd8cc26c': Import translations. DO NOT MERGE