| commit | e15a5b169c52cdb718bebf0ba496353b81202075 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 17:06:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 17:06:42 2015 +0000 |
| tree | 70942743a54834f03191d30679edc384973c925b | |
| parent | 1369b078b268636422a69989729c234e16939094 [diff] | |
| parent | 7011e6de324ae4e14086616d91b1892f77d2c503 [diff] |
am 7011e6de: (-s ours) am f221299b: (-s ours) am d6d398e6: (-s ours) Import translations. DO NOT MERGE * commit '7011e6de324ae4e14086616d91b1892f77d2c503': Import translations. DO NOT MERGE