commit | 1d971416156d8a164d31691cbbbd43b53bdb8015 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jul 20 15:12:50 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 15:12:50 2015 +0000 |
tree | 8d75491ea83a796669d8419e9a45251e1b297c86 | |
parent | 2cc407900fd409235e37d549833a7d2726de0603 [diff] | |
parent | d58a035f9559f142c6ed3f4fa2e02bb3afdf66fe [diff] |
am d58a035f: (-s ours) am bf9b9b1e: (-s ours) am 7b2319d0: (-s ours) am c0fa470d: (-s ours) Import translations. DO NOT MERGE * commit 'd58a035f9559f142c6ed3f4fa2e02bb3afdf66fe': Import translations. DO NOT MERGE