| commit | 28e65b2f7cc596313fdb765f935ccab082d2287a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 07 00:30:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 00:30:39 2014 +0000 |
| tree | 3fbda0eef41357bcc0d76406b841edfe9491d16a | |
| parent | eae0b81fdaa23a5309bfb16f94119553407dff5f [diff] | |
| parent | 77b3cc81d42511842fd13fb0b6cc9367b6767a7e [diff] |
am 77b3cc81: (-s ours) am 9867cbe7: (-s ours) am 6ccf3681: (-s ours) am dec34b5f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '77b3cc81d42511842fd13fb0b6cc9367b6767a7e': Import translations. DO NOT MERGE