| commit | 9498392f8924b3216b4321e69bd1b58c2c4015c3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 22:04:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 22:04:54 2015 +0000 |
| tree | 36aef968cd6bf136e35dd163bafe3b05519412c2 | |
| parent | 979e7fb5f5d803c5944b5b7fcb79f39313daea6b [diff] | |
| parent | d286e72afa00af59b3e7ac53d2fef1ee7b96b61f [diff] |
am d286e72a: (-s ours) am a0c8c941: (-s ours) am 9ba9ce92: (-s ours) Import translations. DO NOT MERGE * commit 'd286e72afa00af59b3e7ac53d2fef1ee7b96b61f':