| commit | 8b8ce26a63bd7bf6c82116b76757510e9a9bc777 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 01 19:59:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 01 19:59:56 2014 +0000 |
| tree | 722afd5f3eb8e540f8beedffeb63eebb14be532f | |
| parent | 06565f05be29d6b383c25c89984eb01e7c5c332c [diff] | |
| parent | 28333368c78f7781fba295f0c7e84928a4653740 [diff] |
am 28333368: (-s ours) am e8f7e8d6: (-s ours) am 5bba5aea: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '28333368c78f7781fba295f0c7e84928a4653740': Import translations. DO NOT MERGE