| commit | b9b8b1edac56335b229dddf94219c3c057deaeab | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 07 17:50:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 17:50:58 2014 +0000 |
| tree | 1787668254e3176e64d6ee9b77a16ff56cee42f2 | |
| parent | cfe35e63c2379d6e51ff68b8a3d1999bde75e5fc [diff] | |
| parent | 946d7388c7afa8043379eb30176fbf848d74e926 [diff] |
am 946d7388: (-s ours) am 3e3b91dc: (-s ours) am d218ba4b: (-s ours) Import translations. DO NOT MERGE * commit '946d7388c7afa8043379eb30176fbf848d74e926': Import translations. DO NOT MERGE