| commit | e2b4569535e841c211dc7068dfa5287a29ba196a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:36:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:36:08 2015 +0000 |
| tree | e839abec40377442f48534c750e9af49730ebd1f | |
| parent | b292bb7a063c3bfeed32ecd7a875de6f77c1c319 [diff] | |
| parent | 61092b075cbbb7a0bdd87d798e75d7983e1021ce [diff] |
am 61092b07: (-s ours) am 836dafe1: (-s ours) am 1500ee05: (-s ours) Import translations. DO NOT MERGE * commit '61092b075cbbb7a0bdd87d798e75d7983e1021ce': Import translations. DO NOT MERGE