| commit | 9710294d14b6e6071d650a33929d230286be8ff0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 23:34:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 23:34:59 2015 +0000 |
| tree | e62d44b05a77d2a0b5d6f8a1c98211f9d773897b | |
| parent | 073477a18ee37c87ad69260edae48f48578af921 [diff] | |
| parent | 01b006e1eae5a28317bf31a1e204b43c5b622344 [diff] |
am 01b006e1: (-s ours) am d64ba82e: (-s ours) Import translations. DO NOT MERGE * commit '01b006e1eae5a28317bf31a1e204b43c5b622344': Import translations. DO NOT MERGE