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