| commit | c5079a06dc2f57718cd781ae855b687a14cc1c2f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 12 23:34:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 23:34:27 2014 +0000 |
| tree | ad1b2f74e2861ee9aa34f32a0a3537e8e5ef8f6d | |
| parent | 6416bec01de67492ac761ba84c8b86c59e4dee28 [diff] | |
| parent | 827ad0c38c76b932237fc22ecfcb35bff8de148f [diff] |
am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '827ad0c38c76b932237fc22ecfcb35bff8de148f': Import translations. DO NOT MERGE