| commit | e2b5070c1096e546ff1e1429732b25c1af7d16f5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Apr 27 14:52:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 27 14:52:14 2015 +0000 |
| tree | 9b98388e7fb6b7700f7068d26c6d7a2b584ef399 | |
| parent | 5312261de76661827eae1915bcf4d42fa36309b0 [diff] | |
| parent | 6d53b90869edf104f4fd78e5c81e146784e164b3 [diff] |
am 6d53b908: (-s ours) am d1b9edab: (-s ours) Import translations. DO NOT MERGE * commit '6d53b90869edf104f4fd78e5c81e146784e164b3': Import translations. DO NOT MERGE