| commit | e8a00afb49712c5c5f79ee03b6b864a5498d856a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 14 00:14:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 00:14:49 2015 +0000 |
| tree | e839abec40377442f48534c750e9af49730ebd1f | |
| parent | 61092b075cbbb7a0bdd87d798e75d7983e1021ce [diff] | |
| parent | b2f710d9bdda596de2de0ee4cf0ba18cf25a6481 [diff] |
am b2f710d9: (-s ours) am c54d8bae: (-s ours) am eb0be29e: (-s ours) Import translations. DO NOT MERGE * commit 'b2f710d9bdda596de2de0ee4cf0ba18cf25a6481': Import translations. DO NOT MERGE