| commit | 5f551a0f1c791f6ed4566d600b09effe0fb3731d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:43:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:43:48 2015 +0000 |
| tree | d341b852a90648f8b06a7b2ae065c1be18dea800 | |
| parent | 31f114b6493949c7204cb4667850c66ccae6ffaa [diff] | |
| parent | 69fb577db85d7924c89f1ab73835dcee3af697bd [diff] |
am 69fb577d: (-s ours) am 955fca8d: (-s ours) am 66fdcfe4: (-s ours) Import translations. DO NOT MERGE * commit '69fb577db85d7924c89f1ab73835dcee3af697bd': Import translations. DO NOT MERGE