| commit | ef2fc997013a39fcd2b0b877f99ca2bd6e4ef343 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:18:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:18:52 2015 +0000 |
| tree | ed74a6aa91f56ea4fbffc4e927c715b2e5f8c910 | |
| parent | c8b271f226c311c2ae37713a0497ef2ad45a79af [diff] | |
| parent | 7ef2f317c9c0fe88cd088dfd5640694907d8f104 [diff] |
am 7ef2f317: (-s ours) am 76d7877c: (-s ours) Import translations. DO NOT MERGE * commit '7ef2f317c9c0fe88cd088dfd5640694907d8f104':