| commit | 3dac3fdee0cfbeafa85fb368e195cf06ce37af5c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 19:28:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 19:28:38 2014 +0000 |
| tree | e8810f8ba53fc8b0558b19116a562883f29b1f0e | |
| parent | 0b1cdec957bdd53cb622209bdd4d5d8178e51890 [diff] | |
| parent | 2c2430222aab31abea0d393b98c02a1ffcf54c19 [diff] |
am 2c243022: (-s ours) am 94fe7134: (-s ours) Import translations. DO NOT MERGE * commit '2c2430222aab31abea0d393b98c02a1ffcf54c19': Import translations. DO NOT MERGE