commit | 577e34c9ebbf1ff09a6341e388795dec2c4fa92f | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon May 04 12:37:42 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 04 12:37:42 2015 +0000 |
tree | 98e5073efa70fd3292116f3066903c0a3ca23119 | |
parent | e0c29e8ef5660ac7bde619bc8e5cd20226599276 [diff] | |
parent | 3f2f2cbbd643661f2a15defa9774eb4c6b27b2a5 [diff] |
am 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE * commit '3f2f2cbbd643661f2a15defa9774eb4c6b27b2a5': Import translations. DO NOT MERGE