| commit | 86ab81d5e9ee76c1e59f197dd1372f455c018beb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 28 23:10:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 28 23:10:52 2015 +0000 |
| tree | 6ebbe3e4cca28409254172988d7fa180b08ee90d | |
| parent | e090d8318ddff9f2fd7bb447c9be8e130fae0abf [diff] | |
| parent | a629d7d24abebe50b3aefba4072e29b06ed259e6 [diff] |
am a629d7d2: (-s ours) am 9fd976e4: (-s ours) Import translations. DO NOT MERGE * commit 'a629d7d24abebe50b3aefba4072e29b06ed259e6': Import translations. DO NOT MERGE