| commit | 0884f09acf51b2187abc5ec038590726f6923b29 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 14 12:59:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 12:59:54 2015 +0000 |
| tree | 890aa3045c01df67feb22771fe54268fc58dda88 | |
| parent | d1ba8f73cebeedf4da291db868afddd34ba94092 [diff] | |
| parent | 67b0ffc88ba0c7effc2f89fb457042bc471b3b98 [diff] |
am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE * commit '67b0ffc88ba0c7effc2f89fb457042bc471b3b98': Import translations. DO NOT MERGE