commit | 847bb7ce2cdb94496494dbae319f83e8392ebf16 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 13 13:44:30 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 13:44:30 2014 +0000 |
tree | 8fa963907c3f67735fefc7c272d03f98b5b2cfd0 | |
parent | 05a57737d4cd05c850c102a3cbcd53d9488ca8a9 [diff] | |
parent | 58ae133a9baf4181c8ec85d234d078257803af89 [diff] |
am 58ae133a: (-s ours) am ef6c6c6f: (-s ours) am fd052e05: (-s ours) Import translations. DO NOT MERGE * commit '58ae133a9baf4181c8ec85d234d078257803af89': Import translations. DO NOT MERGE