| commit | b1a3d465d80f44388641f1f3bec6bf497c62e9b1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Mar 20 23:12:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:12:46 2015 +0000 |
| tree | 648b1d3d905516553b8a4d7062ab5a96d317d54b | |
| parent | a734dab33660ff209b92b3cd9fad31d0f7ae19d2 [diff] | |
| parent | f64541d1651cc8527e4bfd94807f826dfe56e537 [diff] |
am f64541d1: (-s ours) am db057927: (-s ours) am 75f56445: (-s ours) Import translations. DO NOT MERGE * commit 'f64541d1651cc8527e4bfd94807f826dfe56e537':