| commit | edc0b2bd062c3f400cfe738ee1d2dad59dcb8be3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jun 11 17:08:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 11 17:08:19 2015 +0000 |
| tree | b68651d6ace71e82ee0c26acd8fd794f1ee10304 | |
| parent | a33eb90f787a1b2d3eb5ae92b21b1f7fd53742de [diff] | |
| parent | 3b49f548529bc9286f595175c330f06b495153ad [diff] |
am 3b49f548: (-s ours) am 429a40f1: (-s ours) am 7d91e752: (-s ours) Import translations. DO NOT MERGE * commit '3b49f548529bc9286f595175c330f06b495153ad': Import translations. DO NOT MERGE