| commit | c7d7e071970e70c0bb8039949b0c4d097ebaa5cb | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 28 12:44:00 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 28 12:44:00 2013 -0700 |
| tree | 78469c05351dcc4c0f3e674e05198bb5030f60f9 | |
| parent | 04cebc99c29f681df897260c1d8091f6df64bd86 [diff] | |
| parent | 24c97e4c66fdc4086e6dbe362193188698716262 [diff] |
am 24c97e4c: (-s ours) am c98c6cc6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '24c97e4c66fdc4086e6dbe362193188698716262': Import translations. DO NOT MERGE