| commit | cf71886c2f66bc45d33b23b1fa504d1cf249fa30 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 17 20:55:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 20:55:25 2014 +0000 |
| tree | 26cfd153e7e4ee00eafb8decfd53dafd71db48c4 | |
| parent | e8e6b933a73f7ff23bd6c0880cc6d9b82bd4ec9e [diff] | |
| parent | 9d8c759879b7d56a7bf1678f7f1a1a8807ce5636 [diff] |
am 9d8c7598: (-s ours) am 27b80331: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '9d8c759879b7d56a7bf1678f7f1a1a8807ce5636': Import translations. DO NOT MERGE