| commit | f90404ca7b47234437b3f8f418fca313825de02c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 01 19:44:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 01 19:44:10 2014 +0000 |
| tree | 0016934183a783ae551f824652c18a8321634acf | |
| parent | 353da3f98d86eb750b756335892c768f76cc4616 [diff] | |
| parent | ff26f10fab3e79d535001b8e1c9155d7844375c4 [diff] |
am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'ff26f10fab3e79d535001b8e1c9155d7844375c4': Import translations. DO NOT MERGE