| commit | b76c9fcc9168dd3ea7cd8a500b07241435339930 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Jun 23 19:50:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 19:50:02 2014 +0000 |
| tree | b3b5c36a167e4d77bbbd612e9f2a90cb287fcd60 | |
| parent | 01ef2d65e0068f160a602c0e9c2f7f8a2a3f05b3 [diff] | |
| parent | 3d6d550a862f475f16998c6829c6ad36d458a411 [diff] |
am 3d6d550a: (-s ours) am c7001409: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '3d6d550a862f475f16998c6829c6ad36d458a411':