| commit | 0f902aeec92389ce23c33cda797747f1043f011e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 12 14:14:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 14:14:46 2015 +0000 |
| tree | d6323cafa94364964e95b2a31ded4530adde1d27 | |
| parent | 130214885cc2cd790b0082faac0805009ab22de6 [diff] | |
| parent | 97717552a455df152e90735fd3635c1e5b049197 [diff] |
am 97717552: (-s ours) am f3154ed9: (-s ours) am 378ba42a: (-s ours) am dfe2ed8f: (-s ours) Import translations. DO NOT MERGE * commit '97717552a455df152e90735fd3635c1e5b049197': Import translations. DO NOT MERGE