| commit | 313fd897ea29922fb6afbd0bc31b9827255d2bfa | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Feb 25 17:26:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 25 17:26:47 2015 +0000 |
| tree | dfa7bb9f144869f7fe6266887195fec9ddc1f040 | |
| parent | 628ea742c899f8d265010fa48eb119f7de905f7e [diff] | |
| parent | 9d695da8851298858c1280bf7fb7b44f78b501a2 [diff] |
am 9d695da8: (-s ours) am ce64b99e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit '9d695da8851298858c1280bf7fb7b44f78b501a2': Import translations. DO NOT MERGE