| commit | c683cef233646d21e21e49df095836a4986005dd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:08:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:08:27 2015 +0000 |
| tree | 7228ba5307c403204726c8ed9cb5e5a1daa3425c | |
| parent | 650418e5a76e96bb03b5839a8a4ec36dd2106131 [diff] | |
| parent | a2aab1aa459c2f16016e0bc2bd4e93aee2d39c27 [diff] |
am a2aab1aa: (-s ours) am d9662ac6: (-s ours) Import translations. DO NOT MERGE * commit 'a2aab1aa459c2f16016e0bc2bd4e93aee2d39c27': Import translations. DO NOT MERGE