| commit | 523a3f1bac67146529847285cff5f64efeffff15 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 15:17:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 15:17:36 2014 +0000 |
| tree | 67022ea9458501665f759724d7fab96bd25bdcae | |
| parent | 88314114e2c7dc800017bb986ad9f333aa7e59f5 [diff] | |
| parent | d0dbc88b5ffcb8dedd4f95c59bf3716356407930 [diff] |
am d0dbc88b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'd0dbc88b5ffcb8dedd4f95c59bf3716356407930': Import translations. DO NOT MERGE