commit | 08b3171d1000304139d337a365fa203ec6178f1b | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Aug 04 16:04:21 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 04 16:04:21 2014 +0000 |
tree | e54691ce34ea697a2c86d2a2f1889fdc2416f051 | |
parent | bcded397d2f606258265464a09f2c49b7772812d [diff] | |
parent | aa61163ed3f338de0583770be13b38a83f4da04b [diff] |
am 0ef35074: (-s ours) am f12c6aeb: (-s ours) Import translations. DO NOT MERGE * commit '0ef350742bac275b764ccc220b3db5641dae0104': Import translations. DO NOT MERGE