| commit | d075d2f7594df21c94bae63bce4ed4d797baaef8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 16:35:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 16:35:48 2014 +0000 |
| tree | 9a93d37c6bd235ae227454826a6ed504e8c9a036 | |
| parent | daa699ce1dea7882ee7d9f7704a18ca619285a9b [diff] | |
| parent | 038c144442683a633339773d23dd61cb826cad10 [diff] |
am 038c1444: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '038c144442683a633339773d23dd61cb826cad10': Import translations. DO NOT MERGE