| commit | c7b0a8162520ffedcfcddb86d1f0e394513b7cf1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Sep 30 12:47:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 30 12:47:04 2015 +0000 |
| tree | fa8071070f885f177115aa1efe335fb42e775699 | |
| parent | 2b802ceb328658fa18e007f859bda47a755dce30 [diff] | |
| parent | 49b491bb7634284a8622e48c88571aa59ba59ac7 [diff] |
am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE * commit '49b491bb7634284a8622e48c88571aa59ba59ac7': Import translations. DO NOT MERGE