| commit | edc64e6255d3ae3a066da6b46477661586181def | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 20 14:55:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 14:55:30 2015 +0000 |
| tree | 17d92fadd67b4037d76382db6dd59970ff8632c0 | |
| parent | 702c31a9c903fc19b687d5b4927c3cd5d2532f03 [diff] | |
| parent | d8ed79a3ef71535c22620381bf97d895b37f519b [diff] |
am 221cd38f: (-s ours) Import translations. DO NOT MERGE * commit '221cd38f1e10115573328e63ed1bd4c95a9a801a': Import translations. DO NOT MERGE