| commit | a06a903fa4f414bd5a1aa0c6061a5b46b7739013 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 23:00:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 23:00:23 2015 +0000 |
| tree | e1319641cfe21d318389fbf89d84c76c4ae9e61a | |
| parent | 718859d892a1b0fae7cfe470e42a028f46da9000 [diff] | |
| parent | 5d806912451dd81453aac72c9b7b2fa53e4f6096 [diff] |
am 5d806912: (-s ours) am e27c079d: (-s ours) Import translations. DO NOT MERGE * commit '5d806912451dd81453aac72c9b7b2fa53e4f6096': Import translations. DO NOT MERGE