| commit | cec2a65a98161c6c69e373647f03745c59246097 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 14 12:45:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 12:45:51 2015 +0000 |
| tree | fa8071070f885f177115aa1efe335fb42e775699 | |
| parent | 0e3ffe7cce1ceeac9eeac839d41db40ba983f97d [diff] | |
| parent | 26bb544ff277020444b79543302b015160ead18a [diff] |
am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE * commit '26bb544ff277020444b79543302b015160ead18a': Import translations. DO NOT MERGE