commit | b3622e9259438225e76ac67513775ec31e34f477 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Sat Aug 08 14:22:51 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 14:22:51 2015 +0000 |
tree | b1d0713b56fa0e70c3bfd62a0d5306bedd0ae67c | |
parent | 15bea312225715cf96e5923ff49f964d7ff3acf2 [diff] | |
parent | 4927ac9eff2658996ac7ab725dadd5da0de9884f [diff] |
am 4927ac9e: (-s ours) am 51410534: (-s ours) Import translations. DO NOT MERGE * commit '4927ac9eff2658996ac7ab725dadd5da0de9884f': Import translations. DO NOT MERGE