| commit | 57f06e94eb10bfb4edcfe452eb683a920d19ec77 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 12 23:41:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 23:41:57 2014 +0000 |
| tree | d75516488a6346555f3a83cb8b48908a82ada2df | |
| parent | 00ead12087846eed465ffa5c9989878e7d2d0784 [diff] | |
| parent | 2d28d697f6235c497237a11abb973b9109999e38 [diff] |
am 2d28d697: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '2d28d697f6235c497237a11abb973b9109999e38': Import translations. DO NOT MERGE