| commit | 7b680c50115959bbbd74624f64a8eeaf155656ee | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 14 00:42:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 00:42:45 2015 +0000 |
| tree | 08bb4f16d8569c2ac18f26ae8a830a820a9606de | |
| parent | ebb08ad9e09a6e740d4e0c96f6d74fb7e7cbd154 [diff] | |
| parent | 439ed2085635459c3a1d39e483168e15ee892cd3 [diff] |
am 439ed208: (-s ours) am dbf4d24c: (-s ours) am 72c3d940: (-s ours) Import translations. DO NOT MERGE * commit '439ed2085635459c3a1d39e483168e15ee892cd3': Import translations. DO NOT MERGE