| commit | a6e09c12d402bc980952ca44648ee0ba5cd50182 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 07 00:32:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 00:32:21 2014 +0000 |
| tree | 6944cb20af26b1241bcccebba11c2b4b94f45238 | |
| parent | c4fd0715c06b8197ff6f47da5d55f58cc4b336f6 [diff] | |
| parent | 237abb0a373a3f9a9e70e7f11fbc77dd65dcf80f [diff] |
am 237abb0a: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE * commit '237abb0a373a3f9a9e70e7f11fbc77dd65dcf80f': Import translations. DO NOT MERGE